diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 11:19:52 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-31 20:21:13 +0100 |
| commit | ccc71298456d97f64f539e303c771d04dcb33c53 (patch) | |
| tree | 836aa017e856990ff331a24fe0b6078e6b36de80 /libavcodec | |
| parent | b6a4701612514c97d22f7ffb37993539f7718352 (diff) | |
| download | ffmpeg-streaming-ccc71298456d97f64f539e303c771d04dcb33c53.zip ffmpeg-streaming-ccc71298456d97f64f539e303c771d04dcb33c53.tar.gz | |
lavc: deprecate FF_DEBUG_MV and remove all traces of its use
It has not been actually used since
37045e422903695e610cca6ecb753df643ab9380, when the broken vismv code was
removed.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ac086aa..87d0434 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2306,7 +2306,12 @@ typedef struct AVCodecContext { #define FF_DEBUG_BITSTREAM 4 #define FF_DEBUG_MB_TYPE 8 #define FF_DEBUG_QP 16 +#if FF_API_DEBUG_MV +/** + * @deprecated this option does nothing + */ #define FF_DEBUG_MV 32 +#endif #define FF_DEBUG_DCT_COEFF 0x00000040 #define FF_DEBUG_SKIP 0x00000080 #define FF_DEBUG_STARTCODE 0x00000100 diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 718f946..ae458ab 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -321,8 +321,7 @@ static int alloc_picture_tables(MpegEncContext *s, Picture *pic) return AVERROR(ENOMEM); } - if (s->out_format == FMT_H263 || s->encoding || - (s->avctx->debug & FF_DEBUG_MV) || s->avctx->debug_mv) { + if (s->out_format == FMT_H263 || s->encoding) { int mv_size = 2 * (b8_array_size + 4) * sizeof(int16_t); int ref_index_size = 4 * mb_array_size; diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index f6be31b..6c2f090 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -209,7 +209,9 @@ static const AVOption avcodec_options[] = { {"bitstream", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BITSTREAM }, INT_MIN, INT_MAX, V|D, "debug"}, {"mb_type", "macroblock (MB) type", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"}, {"qp", "per-block quantization parameter (QP)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_QP }, INT_MIN, INT_MAX, V|D, "debug"}, +#if FF_API_DEBUG_MV {"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, INT_MAX, V|D, "debug"}, +#endif {"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, INT_MIN, INT_MAX, V|D, "debug"}, {"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, INT_MAX, V|D, "debug"}, {"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, INT_MIN, INT_MAX, V|D, "debug"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index aec0ccd..aaa61cc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -76,5 +76,8 @@ #ifndef FF_API_SET_DIMENSIONS #define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_DEBUG_MV +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |
