diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
| commit | c48e8d9dca550327b88106276aed17f87b23b7fe (patch) | |
| tree | 22691e94c032d6390a6e1a28c3bcf2dbea2f33c0 | |
| parent | fc67d937cc73fb68ab8d840e319e89c52df79c3d (diff) | |
| parent | 59b55c494e01de09dfd7cbf9cbbe7223265ac283 (diff) | |
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
lavc: deprecate unused me_threshold field
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg.c | 3 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 9 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -1009,8 +1009,7 @@ static void do_video_out(AVFormatContext *s, mux_enc->field_order = AV_FIELD_PROGRESSIVE; in_picture->quality = enc->global_quality; - if (!enc->me_threshold) - in_picture->pict_type = 0; + in_picture->pict_type = 0; pts_time = in_picture->pts != AV_NOPTS_VALUE ? in_picture->pts * av_q2d(enc->time_base) : NAN; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5ee6b00acb..4e2e897349 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1794,14 +1794,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 ee6794c0ee..c019027d64 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -334,7 +334,9 @@ static const AVOption avcodec_options[] = { #endif {"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|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 }, -8, 16, V|E}, {"nssew", "nsse weight", OFFSET(nsse_weight), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, |