# HG changeset patch # User mru # Date 1182006919 0 # Node ID 65b1bfb3a74cf6799f4e752bbd5804d77e2be8ea # Parent 1d116d421bbb26a47e511db4fbdd944944dad4e3 move definition of MB_TYPE_H261_FIL to h261.h so h261.c doesn't need to #include "h261data.h" diff -r 1d116d421bbb -r 65b1bfb3a74c h261.c --- a/h261.c Sat Jun 16 15:15:17 2007 +0000 +++ b/h261.c Sat Jun 16 15:15:19 2007 +0000 @@ -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 -r 1d116d421bbb -r 65b1bfb3a74c h261.h --- a/h261.h Sat Jun 16 15:15:17 2007 +0000 +++ b/h261.h Sat Jun 16 15:15:19 2007 +0000 @@ -43,3 +43,4 @@ 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 -r 1d116d421bbb -r 65b1bfb3a74c h261data.h --- a/h261data.h Sat Jun 16 15:15:17 2007 +0000 +++ b/h261data.h Sat Jun 16 15:15:19 2007 +0000 @@ -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 -r 1d116d421bbb -r 65b1bfb3a74c h261dec.c --- a/h261dec.c Sat Jun 16 15:15:17 2007 +0000 +++ b/h261dec.c Sat Jun 16 15:15:19 2007 +0000 @@ -28,8 +28,8 @@ #include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" +#include "h261.h" #include "h261data.h" -#include "h261.h" #define H261_MBA_VLC_BITS 9 #define H261_MTYPE_VLC_BITS 6 diff -r 1d116d421bbb -r 65b1bfb3a74c h261enc.c --- a/h261enc.c Sat Jun 16 15:15:17 2007 +0000 +++ b/h261enc.c Sat Jun 16 15:15:19 2007 +0000 @@ -28,8 +28,8 @@ #include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" +#include "h261.h" #include "h261data.h" -#include "h261.h" extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];