diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-06-16 15:15:19 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-06-16 15:15:19 +0000 |
| commit | b3e83c965d5c3d0f42ed7dc64c70bc59a462b76a (patch) | |
| tree | 082d0274465c6ad57caa9094733e070ef065d893 /libavcodec | |
| parent | 859cfdc0e6aec50430183e9c756e7ef7898c54a5 (diff) | |
| download | ffmpeg-b3e83c965d5c3d0f42ed7dc64c70bc59a462b76a.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h261.c | 1 | ||||
| -rw-r--r-- | libavcodec/h261.h | 1 | ||||
| -rw-r--r-- | libavcodec/h261data.h | 1 | ||||
| -rw-r--r-- | libavcodec/h261dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/h261enc.c | 2 |
5 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/h261.c b/libavcodec/h261.c index 1cf1e48992..b4658c58c3 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 b0ce1bb991..1d4fc848a0 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 2a93b73e33..9be1eeb5b2 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 7f8f141067..f35f79185e 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 a92060a4bb..aea2549c7a 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]; |