diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-27 10:16:14 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-31 13:24:02 +0200 |
| commit | 0dc5e12f1e16d22aca861d42de9c4fd400df46ae (patch) | |
| tree | 6d414d1055ef5ff5e0ee4e8a5c4d0799e8ffd230 /libavcodec/avcodec.h | |
| parent | 38934f19fe624270fabf32a411d84f1fee3e0aae (diff) | |
| download | ffmpeg-0dc5e12f1e16d22aca861d42de9c4fd400df46ae.tar.gz | |
libx264: add 'mbtree' private option.
Deprecate CODEC_FLAG2_MBTREE
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b0317d5a2e..f59b850c35 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -631,8 +631,8 @@ typedef struct RcOverride{ #if FF_API_LAME_GLOBAL_OPTS #define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible #endif -#define CODEC_FLAG2_MBTREE 0x00040000 ///< Use macroblock tree ratecontrol (x264 only) #if FF_API_X264_GLOBAL_OPTS +#define CODEC_FLAG2_MBTREE 0x00040000 ///< Use macroblock tree ratecontrol (x264 only) #define CODEC_FLAG2_PSY 0x00080000 ///< Use psycho visual optimizations. #define CODEC_FLAG2_SSIM 0x00100000 ///< Compute SSIM during encoding, error[] values are undefined. #define CODEC_FLAG2_INTRA_REFRESH 0x00200000 ///< Use periodic insertion of intra blocks instead of keyframes. |