diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-12 20:54:16 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-26 08:16:06 +0200 |
| commit | 6deae83e555982d86ef8cc68b804495092216fc4 (patch) | |
| tree | c85873713795fec30b5d3d4b2cd742937c0efe7d | |
| parent | 694c142434f1b775c93cb2586eebf7ddd5ef6aa8 (diff) | |
| download | android_external_ffmpeg-6deae83e555982d86ef8cc68b804495092216fc4.tar.gz android_external_ffmpeg-6deae83e555982d86ef8cc68b804495092216fc4.tar.bz2 android_external_ffmpeg-6deae83e555982d86ef8cc68b804495092216fc4.zip | |
lavc: remove FF_API_MB_Q cruft
| -rw-r--r-- | libavcodec/avcodec.h | 16 | ||||
| -rw-r--r-- | libavcodec/options.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 23 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e8578a9327..91edaf0d51 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1768,22 +1768,6 @@ 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 d664d41aa8..2f44185f36 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -247,10 +247,6 @@ 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 90402ffff7..d384d54a24 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,9 +47,6 @@ #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 |