diff options
author | Benjamin Larsson <benjamin@southpole.se> | 2011-03-08 15:29:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-08 17:34:02 +0100 |
commit | 76d4c1676f6367df2847d59754717fb076d98f43 (patch) | |
tree | 7a5734573f0fad7498407d0d61cdc060f351db07 | |
parent | 1a204f07602bca48cfa867db8c9f2037a8c221c7 (diff) | |
download | ffmpeg-76d4c1676f6367df2847d59754717fb076d98f43.tar.gz |
Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file".
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | cmdutils.c | 2 | ||||
-rw-r--r-- | cmdutils.h | 1 | ||||
-rw-r--r-- | ffplay.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index e1532cb834..d44aa9ea08 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -214,6 +214,8 @@ unknown_opt: fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg, opt); exit(1); } + } else if (po->flags & OPT_DUMMY) { + /* Do nothing for this option */ } else { po->u.func_arg(arg); } diff --git a/cmdutils.h b/cmdutils.h index b35b99b2b4..adc4403219 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -122,6 +122,7 @@ typedef struct { #define OPT_FUNC2 0x0400 #define OPT_INT64 0x0800 #define OPT_EXIT 0x1000 +#define OPT_DUMMY 0x2000 union { void (*func_arg)(const char *); //FIXME passing error code as int return would be nicer then exit() in the func int *int_arg; @@ -3023,6 +3023,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", OPT_DUMMY, NULL, "ffmpeg compatibility dummy option", ""}, { NULL, }, }; |