aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-22 07:55:34 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-31 10:23:03 +0200
commitfaaecd47082413bcbd94a66ead544c4227fe243e (patch)
tree677b00d713a7726f8f5ae3be77cb2823415fefe6 /libavcodec/avcodec.h
parent3b81636f33e9df53153d7e7add02167c0544e695 (diff)
downloadffmpeg-faaecd47082413bcbd94a66ead544c4227fe243e.tar.gz
libx264: add 'ssim' private option.
Deprecate CODEC_FLAG2_SSIM.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3c7d781ad0..6e16625842 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -623,7 +623,9 @@ typedef struct RcOverride{
#define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible
#define CODEC_FLAG2_MBTREE 0x00040000 ///< Use macroblock tree ratecontrol (x264 only)
#define CODEC_FLAG2_PSY 0x00080000 ///< Use psycho visual optimizations.
+#if FF_API_X264_GLOBAL_OPTS
#define CODEC_FLAG2_SSIM 0x00100000 ///< Compute SSIM during encoding, error[] values are undefined.
+#endif
#define CODEC_FLAG2_INTRA_REFRESH 0x00200000 ///< Use periodic insertion of intra blocks instead of keyframes.
/* Unsupported options :