Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-11 06:00:16 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-10-11 06:00:16 +0400
commite47ab0b2c93e040f51d23239f4080eb6222a94e8 (patch)
tree50b383be2178452881466688ec66cec48c0abaef /ffmpeg_opt.c
parent4334ba043e9601717af3a7ca46addfaf154d5fb6 (diff)
ffmpeg_opt: dont fail for sameq/same_quant.
Instead print a warning. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c10
1 files changed, 10 insertions, 0 deletions
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) },