mirror of https://git.ffmpeg.org/ffmpeg.git
ffmpeg: drop the -deinterlace option
It is undocumented and has been deprecated since 2013.
This commit is contained in:
parent
9d4e290ec4
commit
d013453caa
|
@ -805,23 +805,6 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (do_deinterlace) {
|
|
||||||
AVFilterContext *yadif;
|
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "deinterlace_in_%d_%d",
|
|
||||||
ist->file_index, ist->st->index);
|
|
||||||
if ((ret = avfilter_graph_create_filter(&yadif,
|
|
||||||
avfilter_get_by_name("yadif"),
|
|
||||||
name, "", NULL,
|
|
||||||
fg->graph)) < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if ((ret = avfilter_link(last_filter, 0, yadif, 0)) < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
last_filter = yadif;
|
|
||||||
}
|
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "trim_in_%d_%d",
|
snprintf(name, sizeof(name), "trim_in_%d_%d",
|
||||||
ist->file_index, ist->st->index);
|
ist->file_index, ist->st->index);
|
||||||
if (copy_ts) {
|
if (copy_ts) {
|
||||||
|
|
|
@ -153,7 +153,6 @@ int audio_volume = 256;
|
||||||
int audio_sync_method = 0;
|
int audio_sync_method = 0;
|
||||||
int video_sync_method = VSYNC_AUTO;
|
int video_sync_method = VSYNC_AUTO;
|
||||||
float frame_drop_threshold = 0;
|
float frame_drop_threshold = 0;
|
||||||
int do_deinterlace = 0;
|
|
||||||
int do_benchmark = 0;
|
int do_benchmark = 0;
|
||||||
int do_benchmark_all = 0;
|
int do_benchmark_all = 0;
|
||||||
int do_hex_dump = 0;
|
int do_hex_dump = 0;
|
||||||
|
@ -3788,8 +3787,6 @@ const OptionDef options[] = {
|
||||||
{ "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC |
|
{ "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC |
|
||||||
OPT_OUTPUT, { .off = OFFSET(passlogfiles) },
|
OPT_OUTPUT, { .off = OFFSET(passlogfiles) },
|
||||||
"select two pass log file name prefix", "prefix" },
|
"select two pass log file name prefix", "prefix" },
|
||||||
{ "deinterlace", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_deinterlace },
|
|
||||||
"this option is deprecated, use the yadif filter instead" },
|
|
||||||
{ "psnr", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_psnr },
|
{ "psnr", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_psnr },
|
||||||
"calculate PSNR of compressed frames" },
|
"calculate PSNR of compressed frames" },
|
||||||
{ "vstats", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_vstats },
|
{ "vstats", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_vstats },
|
||||||
|
|
Loading…
Reference in New Issue