[FFmpeg-cvslog] r9339 - in trunk/libavcodec: h261.c h261.h h261data.h h261dec.c h261enc.c

[mru]

Author: mru
Date: Sat Jun 16 17:15:19 2007
New Revision: 9339

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


Modified:
   trunk/libavcodec/h261.c
   trunk/libavcodec/h261.h
   trunk/libavcodec/h261data.h
   trunk/libavcodec/h261dec.c
   trunk/libavcodec/h261enc.c

Modified: trunk/libavcodec/h261.c
==============================================================================
--- trunk/libavcodec/h261.c	(original)
+++ trunk/libavcodec/h261.c	Sat Jun 16 17:15:19 2007
@@ -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)
 

Modified: trunk/libavcodec/h261.h
==============================================================================
--- trunk/libavcodec/h261.h	(original)
+++ trunk/libavcodec/h261.h	Sat Jun 16 17:15:19 2007
@@ -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

Modified: trunk/libavcodec/h261data.h
==============================================================================
--- trunk/libavcodec/h261data.h	(original)
+++ trunk/libavcodec/h261data.h	Sat Jun 16 17:15:19 2007
@@ -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] = {

Modified: trunk/libavcodec/h261dec.c
==============================================================================
--- trunk/libavcodec/h261dec.c	(original)
+++ trunk/libavcodec/h261dec.c	Sat Jun 16 17:15:19 2007
@@ -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

Modified: trunk/libavcodec/h261enc.c
==============================================================================
--- trunk/libavcodec/h261enc.c	(original)
+++ trunk/libavcodec/h261enc.c	Sat Jun 16 17:15:19 2007
@@ -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];