Clarify the error message issued by ffprobe in case of more than one

[libav.git] / ffprobe.c

diff --git a/ffprobe.c b/ffprobe.c
index 9a5951a..2ab0d96 100644 (file)
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -42,6 +42,7 @@ static const OptionDef options[];
 
 /* FFprobe context */
 static const char *input_filename;
+static AVInputFormat *iformat = NULL;
 
 static const char *binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
 static const char *decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P"  };
@@ -183,7 +184,7 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
                                                   &stream->time_base));
 
     while ((tag = av_metadata_get(stream->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX)))
-        printf("%s=%s\n", tag->key, tag->value);
+        printf("TAG:%s=%s\n", tag->key, tag->value);
 
     printf("[/STREAM]\n");
 }
@@ -221,7 +222,7 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
 
     fmt_ctx = avformat_alloc_context();
 
-    if ((err = av_open_input_file(&fmt_ctx, filename, NULL, 0, NULL)) < 0) {
+    if ((err = av_open_input_file(&fmt_ctx, filename, iformat, 0, NULL)) < 0) {
         print_error(filename, err);
         return err;
     }
@@ -278,11 +279,25 @@ static void show_usage(void)
     printf("\n");
 }
 
-static void opt_input_file(const char *filename)
+static void opt_format(const char *arg)
+{
+    iformat = av_find_input_format(arg);
+    if (!iformat) {
+        fprintf(stderr, "Unknown input format: %s\n", arg);
+        exit(1);
+    }
+}
+
+static void opt_input_file(const char *arg)
 {
-    if (!strcmp(filename, "-"))
-        filename = "pipe:";
-    input_filename = filename;
+    if (input_filename) {
+        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
+                arg, input_filename);
+        exit(1);
+    }
+    if (!strcmp(arg, "-"))
+        arg = "pipe:";
+    input_filename = arg;
 }
 
 static void show_help(void)
@@ -302,6 +317,7 @@ static void opt_pretty(void)
 
 static const OptionDef options[] = {
 #include "cmdutils_common_opts.h"
+    { "f", HAS_ARG, {(void*)opt_format}, "force format", "format" },
     { "unit",          OPT_BOOL, {(void*)&show_value_unit},   "show unit of the displayed values" },
     { "prefix",        OPT_BOOL, {(void*)&use_value_prefix}, "use SI prefixes for the displayed values"  },
     { "byte_binary_prefix", OPT_BOOL, {(void*)&use_byte_value_binary_prefix},