[SCM] libav/experimental: Add support to an option -f which forces the format to use for opening the probed multimedia resource.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1be784a2cfdd088fefc9a94e521c550a55ea7fa1
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Feb 21 18:33:24 2010 +0000

    Add support to an option -f which forces the format to use for opening
    the probed multimedia resource.
    
    Originally committed as revision 21944 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffprobe-doc.texi b/doc/ffprobe-doc.texi
index d656de8..6ae8298 100644
--- a/doc/ffprobe-doc.texi
+++ b/doc/ffprobe-doc.texi
@@ -65,6 +65,10 @@ ffprobe [options] [@file{input_file}]
 @section Main options
 
 @table @option
+
+ at item -f @var{format}
+Force format to use.
+
 @item -unit
 Show the unit of the displayed values.
 
diff --git a/ffprobe.c b/ffprobe.c
index 9a5951a..c404e87 100644
--- 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"  };
@@ -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,6 +279,15 @@ static void show_usage(void)
     printf("\n");
 }
 
+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 *filename)
 {
     if (!strcmp(filename, "-"))
@@ -302,6 +312,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},

-- 
Libav/FFmpeg packaging