[SCM] libav/experimental: move definition of MB_TYPE_H261_FIL to h261.h so h261.c doesn't need to #include "h261data.h"

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b3e83c965d5c3d0f42ed7dc64c70bc59a462b76a
Author: Måns Rullgård <mans at mansr.com>
Date:   Sat Jun 16 15:15:19 2007 +0000

    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

diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index 1cf1e48..b4658c5 100644
--- 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 b0ce1bb..1d4fc84 100644
--- 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 2a93b73..9be1eeb 100644
--- 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 7f8f141..f35f791 100644
--- 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 a92060a..aea2549 100644
--- 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];
 

-- 
Libav/FFmpeg packaging