diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 07:55:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-31 10:24:17 +0200 |
| commit | 34dda1251d590df559f54f67b3a3a80e3f5835d7 (patch) | |
| tree | cf1d4ffd885d00f8559015dd5509f85d9a1ed578 /libavcodec/avcodec.h | |
| parent | 5d4a1048ee251cf7cb2da7d24f23da6d8a34459a (diff) | |
| download | ffmpeg-34dda1251d590df559f54f67b3a3a80e3f5835d7.tar.gz | |
libx264: add 'b-pyramid' private option.
Deprecate CODEC_FLAG2_BPYRAMID.
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ea05ed4102..36d3fde0a4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -607,7 +607,9 @@ typedef struct RcOverride{ #define CODEC_FLAG2_STRICT_GOP 0x00000002 ///< Strictly enforce GOP size. #define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding. #define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata. +#if FF_API_X264_GLOBAL_OPTS #define CODEC_FLAG2_BPYRAMID 0x00000010 ///< H.264 allow B-frames to be used as references. +#endif #define CODEC_FLAG2_WPRED 0x00000020 ///< H.264 weighted biprediction for B-frames #define CODEC_FLAG2_MIXED_REFS 0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock #define CODEC_FLAG2_8X8DCT 0x00000080 ///< H.264 high profile 8x8 transform |