summaryrefslogtreecommitdiff
path: root/avconv_opt.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-05-04 14:15:06 +0200
committerAnton Khirnov <anton@khirnov.net>2013-05-07 12:31:55 +0200
commit481575d255195c6c2f32e04686b94de984ae78d4 (patch)
tree57c743074d8bf739dd3d64cd97806afe9d46bded /avconv_opt.c
parenta97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8 (diff)
avconv: remove -deinterlace
It is incompatible with refcounted frames and since it's been deprecated for a long time now, fixing it is not worth the effort.
Diffstat (limited to 'avconv_opt.c')
-rw-r--r--avconv_opt.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index 6645196fd9..ae9b72ee9d 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -61,7 +61,6 @@ float dts_delta_threshold = 10;
int audio_volume = 256;
int audio_sync_method = 0;
int video_sync_method = VSYNC_AUTO;
-int do_deinterlace = 0;
int do_benchmark = 0;
int do_hex_dump = 0;
int do_pkt_dump = 0;
@@ -1864,15 +1863,6 @@ static int opt_vsync(void *optctx, const char *opt, const char *arg)
return 0;
}
-#if FF_API_DEINTERLACE
-static int opt_deinterlace(void *optctx, const char *opt, const char *arg)
-{
- av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -filter:v yadif instead\n", opt);
- do_deinterlace = 1;
- return 0;
-}
-#endif
-
int opt_cpuflags(void *optctx, const char *opt, const char *arg)
{
int flags = av_parse_cpu_flags(arg);
@@ -2255,10 +2245,6 @@ const OptionDef options[] = {
{ "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC |
OPT_OUTPUT, { .off = OFFSET(passlogfiles) },
"select two pass log file name prefix", "prefix" },
-#if FF_API_DEINTERLACE
- { "deinterlace", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_deinterlace },
- "this option is deprecated, use the yadif filter instead" },
-#endif
{ "vstats", OPT_VIDEO | OPT_EXPERT , { &opt_vstats },
"dump video coding statistics to file" },
{ "vstats_file", OPT_VIDEO | HAS_ARG | OPT_EXPERT , { opt_vstats_file },