aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-01 13:15:09 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-06 21:02:45 +0200
commit71b5f4427b3c17eeea9903aa3bd091db81222c6d (patch)
treeb7827a5ded2bc27b10a9cebdacb3a13f45a0fe32 /libavcodec/avcodec.h
parentf83c45183e6b98e553d25cbf51a9b4c729e959b9 (diff)
downloadffmpeg-71b5f4427b3c17eeea9903aa3bd091db81222c6d.tar.gz
libx264: add 'deblock' private option
Deprecate AVCodecContext.deblockalpha/deblockbeta
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e31190b309..8a51c5865f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2456,13 +2456,14 @@ typedef struct AVCodecContext {
*/
float complexityblur;
+#if FF_API_X264_GLOBAL_OPTS
/**
* in-loop deblocking filter alphac0 parameter
* alpha is in the range -6...6
* - encoding: Set by user.
* - decoding: unused
*/
- int deblockalpha;
+ attribute_deprecated int deblockalpha;
/**
* in-loop deblocking filter beta parameter
@@ -2470,7 +2471,8 @@ typedef struct AVCodecContext {
* - encoding: Set by user.
* - decoding: unused
*/
- int deblockbeta;
+ attribute_deprecated int deblockbeta;
+#endif
/**
* macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4