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:25:06 +0200 |
| commit | eab21c32e34d8dc45e915c597cf974f31a95c207 (patch) | |
| tree | f6fbac4e7da30fa4add1614246a2bf47776af151 /libavcodec/avcodec.h | |
| parent | 0f29699db73d569307cac1abce64ae43647db2d2 (diff) | |
| download | ffmpeg-eab21c32e34d8dc45e915c597cf974f31a95c207.tar.gz | |
libx264: add 'mixed-refs' private option.
Deprecate CODEC_FLAG2_MIXED_REFS.
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 3b669ceb1f..c7c8583ac1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -610,8 +610,8 @@ typedef struct RcOverride{ #if FF_API_X264_GLOBAL_OPTS #define CODEC_FLAG2_BPYRAMID 0x00000010 ///< H.264 allow B-frames to be used as references. #define CODEC_FLAG2_WPRED 0x00000020 ///< H.264 weighted biprediction for B-frames -#endif #define CODEC_FLAG2_MIXED_REFS 0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock +#endif #define CODEC_FLAG2_8X8DCT 0x00000080 ///< H.264 high profile 8x8 transform #define CODEC_FLAG2_FASTPSKIP 0x00000100 ///< H.264 fast pskip #define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters |