summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Larsson <benjamin@southpole.se>2011-03-08 15:29:46 +0100
committerAnton Khirnov <anton@khirnov.net>2011-05-11 07:32:36 +0200
commit91199cfe55b1398b23a16b1f55df75e62e05198b (patch)
tree3741902e27ad258e37f21dd430e9bfe55ea56a13
parentffc437c026dd0e1b8e5d9114163b4e95999b95fd (diff)
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 <anton@khirnov.net>
-rw-r--r--cmdutils.c4
-rw-r--r--ffplay.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c
index f95778822e..feeea694d8 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 11b307eaca..07727b667a 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, },
};