diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 13:54:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 13:54:04 +0100 |
| commit | 4257b804e2354db07e66ebfd966d7d13f49c7895 (patch) | |
| tree | c33fbe3ef3fe68ff196094483aa9a7d7fc6b53b4 /ffmpeg_opt.c | |
| parent | f3980b75f82b83217260c50e71db8606390a2340 (diff) | |
| download | android_external_ffmpeg-4257b804e2354db07e66ebfd966d7d13f49c7895.tar.gz android_external_ffmpeg-4257b804e2354db07e66ebfd966d7d13f49c7895.tar.bz2 android_external_ffmpeg-4257b804e2354db07e66ebfd966d7d13f49c7895.zip | |
ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 4b2cfeb794..716696c8f3 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2233,15 +2233,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 - static int opt_timecode(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; @@ -2656,10 +2647,8 @@ 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 }, + { "deinterlace", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_deinterlace }, "this option is deprecated, use the yadif filter instead" }, -#endif { "psnr", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &do_psnr }, "calculate PSNR of compressed frames" }, { "vstats", OPT_VIDEO | OPT_EXPERT , { &opt_vstats }, |