Browse code

move definition of MB_TYPE_H261_FIL to h261.h so h261.c doesn't need to #include "h261data.h"

Originally committed as revision 9339 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2007/06/17 00:15:19
Showing 5 changed files
... ...
@@ -28,7 +28,6 @@
28 28
 #include "dsputil.h"
29 29
 #include "avcodec.h"
30 30
 #include "h261.h"
31
-#include "h261data.h"
32 31
 
33 32
 #define IS_FIL(a)    ((a)&MB_TYPE_H261_FIL)
34 33
 
... ...
@@ -43,3 +43,4 @@ typedef struct H261Context{
43 43
     int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read
44 44
 }H261Context;
45 45
 
46
+#define MB_TYPE_H261_FIL 0x800000
... ...
@@ -23,7 +23,6 @@
23 23
  * @file h261data.h
24 24
  * H.261 tables.
25 25
  */
26
-#define MB_TYPE_H261_FIL 0x800000
27 26
 
28 27
 // H.261 VLC table for macroblock addressing
29 28
 static const uint8_t h261_mba_code[35] = {
... ...
@@ -28,8 +28,8 @@
28 28
 #include "dsputil.h"
29 29
 #include "avcodec.h"
30 30
 #include "mpegvideo.h"
31
-#include "h261data.h"
32 31
 #include "h261.h"
32
+#include "h261data.h"
33 33
 
34 34
 #define H261_MBA_VLC_BITS 9
35 35
 #define H261_MTYPE_VLC_BITS 6
... ...
@@ -28,8 +28,8 @@
28 28
 #include "dsputil.h"
29 29
 #include "avcodec.h"
30 30
 #include "mpegvideo.h"
31
-#include "h261data.h"
32 31
 #include "h261.h"
32
+#include "h261data.h"
33 33
 
34 34
 extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
35 35