summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avconv.c11
-rw-r--r--doc/avconv.texi2
2 files changed, 11 insertions, 2 deletions
diff --git a/avconv.c b/avconv.c
index a6f0838a96..9f4766ee38 100644
--- a/avconv.c
+++ b/avconv.c
@@ -4371,6 +4371,13 @@ static int opt_vsync(const char *opt, const char *arg)
return 0;
}
+static int opt_deinterlace(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;
+}
+
#define OFFSET(x) offsetof(OptionsContext, x)
static const OptionDef options[] = {
/* main options */
@@ -4435,8 +4442,8 @@ static const OptionDef options[] = {
"use same quantizer as source (implies VBR)" },
{ "pass", HAS_ARG | OPT_VIDEO, {(void*)opt_pass}, "select the pass number (1 or 2)", "n" },
{ "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename_prefix}, "select two pass log file name prefix", "prefix" },
- { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace},
- "deinterlace pictures" },
+ { "deinterlace", OPT_EXPERT | OPT_VIDEO, {(void*)opt_deinterlace},
+ "this option is deprecated, use the yadif filter instead" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
#if CONFIG_AVFILTER
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 0a83326379..6d96a2f0d3 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -528,6 +528,8 @@ How strictly to follow the standards.
@item -deinterlace
Deinterlace pictures.
+This option is deprecated since the deinterlacing is very low quality.
+Use the yadif filter with @code{-filter:v yadif}.
@item -vstats
Dump video coding statistics to @file{vstats_HHMMSS.log}.
@item -vstats_file @var{file}