diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:44 +0200 |
| commit | 0b3a88fe1585f9d5d64da89417c0f8cc6788526a (patch) | |
| tree | b5101398956732ea5405099189e57a53f669109f | |
| parent | 563fe360c356c0144badd63063c16dae989b5379 (diff) | |
| download | ffmpeg-0b3a88fe1585f9d5d64da89417c0f8cc6788526a.tar.gz | |
Revert "lavc: remove FF_API_MB_Q cruft"
This reverts commit 6deae83e555982d86ef8cc68b804495092216fc4.
| -rw-r--r-- | libavcodec/avcodec.h | 16 | ||||
| -rw-r--r-- | libavcodec/options.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 23 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bc61007137..86560f5cd7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1816,6 +1816,22 @@ typedef struct AVCodecContext { */ uint64_t error[4]; +#if FF_API_MB_Q + /** + * minimum MB quantizer + * - encoding: unused + * - decoding: unused + */ + attribute_deprecated int mb_qmin; + + /** + * maximum MB quantizer + * - encoding: unused + * - decoding: unused + */ + attribute_deprecated int mb_qmax; +#endif + /** * motion estimation comparison function * - encoding: Set by user. diff --git a/libavcodec/options.c b/libavcodec/options.c index 1d8b7dc567..c8220e43b3 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -253,6 +253,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 522c6d6886..b13c953028 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -71,6 +71,9 @@ #ifndef FF_API_OLD_AUDIOCONVERT #define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54) #endif +#ifndef FF_API_MB_Q +#define FF_API_MB_Q (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #ifndef FF_API_ANTIALIAS_ALGO #define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54) #endif |