From 54b298fe5650c124c29a8283cfd05024ac409d3a Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 3 Mar 2013 08:23:08 -0800 Subject: lavc: Deprecate the deinterlace functions in libavcodec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- avconv_opt.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'avconv_opt.c') diff --git a/avconv_opt.c b/avconv_opt.c index 7c58f49e3b..5bb7fb75f5 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -1715,12 +1715,14 @@ 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) { @@ -2057,8 +2059,10 @@ const OptionDef options[] = { "select the pass number (1 or 2)", "n" }, { "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC, { .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 }, -- cgit v1.2.3