diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-05-06 22:38:18 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-05-06 22:38:18 +0000 |
| commit | e8c7fca90c7474e2352efcbf4d71e19a85abc238 (patch) | |
| tree | 4a5b1675f07340eb0f4d71a0353f86b5ee16e152 /libavcodec/avcodec.h | |
| parent | 46174079c9c1e83048b278b3790cccddcacb2325 (diff) | |
Add intra refresh and crf-max support to the libavcodec libx264 wrapper.
Minor version bump.
Originally committed as revision 23038 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b6437473e6..be9994f7b2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 66 +#define LIBAVCODEC_VERSION_MINOR 67 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -597,6 +597,7 @@ typedef struct RcOverride{ #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. /* Unsupported options : * Syntax Arithmetic coding (SAC) @@ -2646,6 +2647,15 @@ typedef struct AVCodecContext { * - decoding: unused */ int rc_lookahead; + + /** + * Constant rate factor maximum + * With CRF encoding mode and VBV restrictions enabled, prevents quality from being worse + * than crf_max, even if doing so would violate VBV restrictions. + * - encoding: Set by user. + * - decoding: unused + */ + float crf_max; } AVCodecContext; /** |