ffmpeg_opt: dont fail for sameq/same_quant.

Instead print a warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-11 04:00:16 +02:00
parent 4334ba043e
commit e47ab0b2c9

View File

@ -157,6 +157,12 @@ static int opt_pad(void *optctx, const char *opt, const char *arg)
return -1; 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) 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"); 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" }, "rate control override for specific intervals", "override" },
{ "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_codec }, { "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_codec },
"force video codec ('copy' to copy stream)", "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 }, { "timecode", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_timecode },
"set initial TimeCode value.", "hh:mm:ss[:;.]ff" }, "set initial TimeCode value.", "hh:mm:ss[:;.]ff" },
{ "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT, { .off = OFFSET(pass) }, { "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT, { .off = OFFSET(pass) },