From e47ab0b2c93e040f51d23239f4080eb6222a94e8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 11 Oct 2012 04:00:16 +0200 Subject: [PATCH] ffmpeg_opt: dont fail for sameq/same_quant. Instead print a warning. Signed-off-by: Michael Niedermayer --- ffmpeg_opt.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 10c0d04c66..23dbb3eba0 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -157,6 +157,12 @@ static int opt_pad(void *optctx, const char *opt, const char *arg) return -1; } +static int opt_sameq(void *optctx, const char *opt, const char *arg) +{ + av_log(NULL, AV_LOG_WARNING, "Ignoring option '%s'\n", opt); + return 0; +} + static int opt_video_channel(void *optctx, const char *opt, const char *arg) { av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -channel.\n"); @@ -2389,6 +2395,10 @@ const OptionDef options[] = { "rate control override for specific intervals", "override" }, { "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_codec }, "force video codec ('copy' to copy stream)", "codec" }, + { "sameq", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_sameq }, + "Removed" }, + { "same_quant", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_sameq }, + "Removed" }, { "timecode", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_timecode }, "set initial TimeCode value.", "hh:mm:ss[:;.]ff" }, { "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT, { .off = OFFSET(pass) },