Browse Source

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>
Benjamin Larsson 14 years ago
parent
commit
91199cfe55
2 changed files with 3 additions and 2 deletions
  1. 2 2
      cmdutils.c
  2. 1 0
      ffplay.c

+ 2 - 2
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);

+ 1 - 0
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, },
 };