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:26:11 +0200 |
| commit | cf90c5d0e0a48cbc63cd3355b2fa77a5545f0c2b (patch) | |
| tree | 8c65d5168b20242176826eb8a94b397f0d2cf8a8 /libavcodec/avcodec.h | |
| parent | 3b82aeeec0a320a78d548ff0147b3cdb26ea982c (diff) | |
| download | ffmpeg-cf90c5d0e0a48cbc63cd3355b2fa77a5545f0c2b.tar.gz | |
libx264: add 'aud' private option.
Deprecate CODEC_FLAG2_AUD.
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 2f10d245c7..d5a4cf34b6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -613,8 +613,8 @@ typedef struct RcOverride{ #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 #define CODEC_FLAG2_FASTPSKIP 0x00000100 ///< H.264 fast pskip -#endif #define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters +#endif #define CODEC_FLAG2_BRDO 0x00000400 ///< B-frame rate-distortion optimization #define CODEC_FLAG2_INTRA_VLC 0x00000800 ///< Use MPEG-2 intra VLC table. #define CODEC_FLAG2_MEMC_ONLY 0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC). |