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

diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index 1cf1e489924e9e315b063ead1aa9ed369adcca75..b4658c58c3f1c01511dc09abfb7f62ea58656fa8 100644 (file)
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -28,7 +28,6 @@
 #include "dsputil.h"
 #include "avcodec.h"
 #include "h261.h"
-#include "h261data.h"
 
 #define IS_FIL(a)    ((a)&MB_TYPE_H261_FIL)
 

diff --git a/libavcodec/h261.h b/libavcodec/h261.h
index b0ce1bb991317b656b770139890621e3b80fdef3..1d4fc848a07ecf09fcbeecbc07c52354a73bc17b 100644 (file)
--- a/libavcodec/h261.h
+++ b/libavcodec/h261.h
@@ -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
 }H261Context;
 
+#define MB_TYPE_H261_FIL 0x800000

diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h
index 2a93b73e33f494d8b23489329d24f69cca05aba4..9be1eeb5b229562f4b9293997ced77aa563146af 100644 (file)
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@@ -23,7 +23,6 @@
  * @file h261data.h
  * H.261 tables.
  */
-#define MB_TYPE_H261_FIL 0x800000
 
 // H.261 VLC table for macroblock addressing
 static const uint8_t h261_mba_code[35] = {

diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 7f8f14106716aea84607161bda9feaafc5949efb..f35f79185eef3b0c077d371103ebea0989810db6 100644 (file)
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -28,8 +28,8 @@
 #include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
-#include "h261data.h"
 #include "h261.h"
+#include "h261data.h"
 
 #define H261_MBA_VLC_BITS 9
 #define H261_MTYPE_VLC_BITS 6

diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c
index a92060a4bb400df55e44c2993548842480e4f365..aea2549c7a4a3bec7a26e4afac29a07518e2cdfe 100644 (file)
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@ -28,8 +28,8 @@
 #include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
-#include "h261data.h"
 #include "h261.h"
+#include "h261data.h"
 
 extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];