diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-10-08 10:58:43 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-10-18 05:28:29 +0200 |
| commit | c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866 (patch) | |
| tree | ccfb79b60457c5cd10312931d1130e72da08fee4 | |
| parent | 685be3d1aecf965281128f3b631ed965bcfa754d (diff) | |
lavc: deprecate unused mb_threshold field
| -rw-r--r-- | libavcodec/avcodec.h | 7 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 7 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9d9f562a02..bf76b1cbd4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1614,14 +1614,13 @@ typedef struct AVCodecContext { */ attribute_deprecated int me_threshold; -#endif /** - * Macroblock threshold below which the user specified macroblock types will be used. - * - encoding: Set by user. - * - decoding: unused + * @deprecated this field is unused */ + attribute_deprecated int mb_threshold; +#endif /** * precision of the intra DC coefficient - 8 diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 3de3b096c6..2084fe99ed 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -510,13 +510,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) return -1; } - i = (INT_MAX / 2 + 128) >> 8; - if (avctx->mb_threshold >= i) { - av_log(avctx, AV_LOG_ERROR, "mb_threshold too large, max is %d\n", - i - 1); - return -1; - } - if (avctx->b_frame_strategy && (avctx->flags & CODEC_FLAG_PASS2)) { av_log(avctx, AV_LOG_INFO, "notice: b_frame_strategy only affects the first pass\n"); diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index eadc71829a..22480d7ae2 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -322,8 +322,8 @@ static const AVOption avcodec_options[] = { {"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, #if FF_API_MPV_OPT {"me_threshold", "motion estimation threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif {"dc", "intra_dc_precision", OFFSET(intra_dc_precision), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E}, {"nssew", "nsse weight", OFFSET(nsse_weight), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, {"skip_top", "number of macroblock rows at the top which are skipped", OFFSET(skip_top), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, |