Commit dde30cdc authored by mru's avatar mru

move definition of MB_TYPE_H261_FIL to h261.h so h261.c doesn't

need to #include "h261data.h"


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9339 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 14e12fd2
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "dsputil.h" #include "dsputil.h"
#include "avcodec.h" #include "avcodec.h"
#include "h261.h" #include "h261.h"
#include "h261data.h"
#define IS_FIL(a) ((a)&MB_TYPE_H261_FIL) #define IS_FIL(a) ((a)&MB_TYPE_H261_FIL)
......
...@@ -43,3 +43,4 @@ typedef struct H261Context{ ...@@ -43,3 +43,4 @@ typedef struct H261Context{
int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read
}H261Context; }H261Context;
#define MB_TYPE_H261_FIL 0x800000
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
* @file h261data.h * @file h261data.h
* H.261 tables. * H.261 tables.
*/ */
#define MB_TYPE_H261_FIL 0x800000
// H.261 VLC table for macroblock addressing // H.261 VLC table for macroblock addressing
static const uint8_t h261_mba_code[35] = { static const uint8_t h261_mba_code[35] = {
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "dsputil.h" #include "dsputil.h"
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "h261data.h"
#include "h261.h" #include "h261.h"
#include "h261data.h"
#define H261_MBA_VLC_BITS 9 #define H261_MBA_VLC_BITS 9
#define H261_MTYPE_VLC_BITS 6 #define H261_MTYPE_VLC_BITS 6
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "dsputil.h" #include "dsputil.h"
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "h261data.h"
#include "h261.h" #include "h261.h"
#include "h261data.h"
extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment