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>
oldabi
Benjamin Larsson 14 years ago committed by Michael Niedermayer
parent 1a204f0760
commit 76d4c1676f
  1. 2
      cmdutils.c
  2. 1
      cmdutils.h
  3. 1
      ffplay.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);
}

@ -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, },
};

Loading…
Cancel
Save