From 91199cfe55b1398b23a16b1f55df75e62e05198b Mon Sep 17 00:00:00 2001 From: Benjamin Larsson Date: Tue, 8 Mar 2011 15:29:46 +0100 Subject: [PATCH] ffplay: add a dummy option -i so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file". Signed-off-by: Anton Khirnov --- cmdutils.c | 4 ++-- ffplay.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index f95778822..feeea694d 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -281,8 +281,8 @@ unknown_opt: fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg, opt); exit(1); } - } else { - po->u.func_arg(arg); + } else if (po->u.func_arg) { + po->u.func_arg(arg); } if(po->flags & OPT_EXIT) exit(0); diff --git a/ffplay.c b/ffplay.c index 11b307eac..07727b667 100644 --- a/ffplay.c +++ b/ffplay.c @@ -3019,6 +3019,7 @@ static const OptionDef options[] = { #endif { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" }, { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, + { "i", 0, {NULL}, "ffmpeg compatibility dummy option", ""}, { NULL, }, }; -- 2.11.0