diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-09 23:31:02 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-09 23:31:02 +0000 |
| commit | 9701840bb539546bc0cfb1307b04655140851b04 (patch) | |
| tree | 283d60d225a87c960c78d20975491802b3385797 /libavcodec/mpegvideo.h | |
| parent | 88855b51cdba35c2e7daf8351645d91cf85cb8af (diff) | |
| download | ffmpeg-9701840bb539546bc0cfb1307b04655140851b04.tar.gz | |
add FF_ prefix to all (frame)_TYPE usage
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index fa7420a616..b18b52dd5c 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -61,13 +61,6 @@ enum OutputFormat { #define ME_MAP_SHIFT 3 #define ME_MAP_MV_BITS 11 -#define I_TYPE FF_I_TYPE ///< Intra -#define P_TYPE FF_P_TYPE ///< Predicted -#define B_TYPE FF_B_TYPE ///< Bi-dir predicted -#define S_TYPE FF_S_TYPE ///< S(GMC)-VOP MPEG4 -#define SI_TYPE FF_SI_TYPE ///< Switching Intra -#define SP_TYPE FF_SP_TYPE ///< Switching Predicted - #define MAX_MB_BYTES (30*16*16*3/8 + 120) #define INPLACE_OFFSET 16 @@ -316,7 +309,7 @@ typedef struct MpegEncContext { int *lambda_table; int adaptive_quant; ///< use adaptive quantization int dquant; ///< qscale difference to prev qscale - int pict_type; ///< I_TYPE, P_TYPE, B_TYPE, ... + int pict_type; ///< FF_I_TYPE, FF_P_TYPE, FF_B_TYPE, ... int last_pict_type; //FIXME removes int last_non_b_pict_type; ///< used for mpeg4 gmc b-frames & ratecontrol int dropable; |