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:54 +0200 |
| commit | 3b82aeeec0a320a78d548ff0147b3cdb26ea982c (patch) | |
| tree | e976a8f4c33a0e6146cf55a6040912c740cf3dbd /libavcodec/avcodec.h | |
| parent | 373257fa793b5ec2c22236a446d889018838e362 (diff) | |
| download | ffmpeg-3b82aeeec0a320a78d548ff0147b3cdb26ea982c.tar.gz | |
libx264: add 'fast-pskip' private option.
Deprecate CODEC_FLAG2_FASTPSKIP.
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 52c5fa05e6..2f10d245c7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -612,8 +612,8 @@ typedef struct RcOverride{ #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 -#endif #define CODEC_FLAG2_FASTPSKIP 0x00000100 ///< H.264 fast pskip +#endif #define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters #define CODEC_FLAG2_BRDO 0x00000400 ///< B-frame rate-distortion optimization #define CODEC_FLAG2_INTRA_VLC 0x00000800 ///< Use MPEG-2 intra VLC table. |