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-24 14:31:07 +0200
commit2a44a8f6091913bad14c4df318ceeb68dc4a9258 (patch)
tree1b0e1da35f70c0932c71f33f0c49e9a80f206876 /libavcodec/avcodec.h
parent93e623c642d3966b74bd0b4913357527123546f5 (diff)
downloadffmpeg-2a44a8f6091913bad14c4df318ceeb68dc4a9258.tar.gz
libx264: add 'psy_trellis' private option.
Deprecate corresponding global option.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 29b6994aec..c36c35e686 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2748,7 +2748,6 @@ typedef struct AVCodecContext {
* - decoding: unused
*/
attribute_deprecated float psy_rd;
-#endif
/**
* PSY trellis
@@ -2756,7 +2755,8 @@ typedef struct AVCodecContext {
* - encoding: Set by user
* - decoding: unused
*/
- float psy_trellis;
+ attribute_deprecated float psy_trellis;
+#endif
/**
* RC lookahead