diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-02 13:18:00 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-03 08:43:09 +0200 |
| commit | 4a49d2d59cce5d10b8ac40ca0185ccf1f8deb99c (patch) | |
| tree | 43618059cb7df6bcc183385236abf189f4c3d3a1 | |
| parent | bc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff) | |
| download | ffmpeg-4a49d2d59cce5d10b8ac40ca0185ccf1f8deb99c.tar.gz | |
lavc: mark mb_qmin/mb_qmax for removal on next major bump.
They've been unused and deprecated for about five years.
| -rw-r--r-- | libavcodec/avcodec.h | 6 | ||||
| -rw-r--r-- | libavcodec/options.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 83e0e56555..eb355b0b33 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1818,19 +1818,21 @@ typedef struct AVCodecContext { */ uint64_t error[4]; +#if FF_API_MB_Q /** * minimum MB quantizer * - encoding: unused * - decoding: unused */ - int mb_qmin; + attribute_deprecated int mb_qmin; /** * maximum MB quantizer * - encoding: unused * - decoding: unused */ - int mb_qmax; + attribute_deprecated int mb_qmax; +#endif /** * motion estimation comparison function diff --git a/libavcodec/options.c b/libavcodec/options.c index fb7d371607..e1188cdeb5 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -259,8 +259,10 @@ static const AVOption options[]={ {"pf", "forward predicted MVs of P-frames", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_MV_P_FOR, INT_MIN, INT_MAX, V|D, "debug_mv"}, {"bf", "forward predicted MVs of B-frames", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_MV_B_FOR, INT_MIN, INT_MAX, V|D, "debug_mv"}, {"bb", "backward predicted MVs of B-frames", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_MV_B_BACK, INT_MIN, INT_MAX, V|D, "debug_mv"}, +#if FF_API_MB_Q {"mb_qmin", "obsolete, use qmin", OFFSET(mb_qmin), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"mb_qmax", "obsolete, use qmax", OFFSET(mb_qmax), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, +#endif {"cmp", "full pel me compare function", OFFSET(me_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"subcmp", "sub pel me compare function", OFFSET(me_sub_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"mbcmp", "macroblock compare function", OFFSET(mb_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 9d211b90fe..a0e19754a7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -77,5 +77,8 @@ #ifndef FF_API_RATE_EMU #define FF_API_RATE_EMU (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_MB_Q +#define FF_API_MB_Q (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #endif /* AVCODEC_VERSION_H */ |