diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-10-08 10:39:02 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-10-18 05:26:56 +0200 |
| commit | 59b55c494e01de09dfd7cbf9cbbe7223265ac283 (patch) | |
| tree | 7bf55f68c49547626293db6d74fb5a6a8025138a | |
| parent | 66a68ddd1ac376b24db8695058bc8fc28f5bada6 (diff) | |
| download | ffmpeg-59b55c494e01de09dfd7cbf9cbbe7223265ac283.tar.gz | |
lavc: deprecate unused me_threshold field
| -rw-r--r-- | avconv.c | 3 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 9 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -564,8 +564,7 @@ static void do_video_out(AVFormatContext *s, in_picture->top_field_first = !!ost->top_field_first; in_picture->quality = enc->global_quality; - if (!enc->me_threshold) - in_picture->pict_type = 0; + in_picture->pict_type = 0; if (ost->forced_kf_index < ost->forced_kf_count && in_picture->pts >= ost->forced_kf_pts[ost->forced_kf_index]) { in_picture->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4b25cb1478..9d9f562a02 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1608,14 +1608,13 @@ typedef struct AVCodecContext { */ int noise_reduction; +#if FF_API_MPV_OPT /** - * Motion estimation threshold below which no motion estimation is - * performed, but instead the user specified motion vectors are used. - * - * - encoding: Set by user. - * - decoding: unused + * @deprecated this field is unused */ + attribute_deprecated int me_threshold; +#endif /** * Macroblock threshold below which the user specified macroblock types will be used. diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index ce6a3ae05f..eadc71829a 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -320,7 +320,9 @@ static const AVOption avcodec_options[] = { #endif {"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|E|D, "threads"}, {"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}, {"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}, |