X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/336ce917e6e6adb10ee44945684c67cdea65e228..7acc01042e5eeeaa5ba1a44e6215b43ceafa78e9:/ffprobe.c?ds=inline

diff --git a/ffprobe.c b/ffprobe.c
index 47dad44..b6ac061 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -19,11 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#undef HAVE_AV_CONFIG_H
+#include "config.h"
+
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/opt.h"
 #include "libavutil/pixdesc.h"
+#include "libavdevice/avdevice.h"
 #include "cmdutils.h"
 
 const char program_name[] = "FFprobe";
@@ -42,6 +44,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"  };
@@ -67,7 +70,7 @@ static char *value_string(char *buf, int buf_size, double val, const char *unit)
         int index;
 
         if (unit == unit_byte_str && use_byte_value_binary_prefix) {
-            index = (int) (log2(val)) / 10;
+            index = (int) (log(val)/log(2)) / 10;
             index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) -1);
             val /= pow(2, index*10);
             prefix_string = binary_unit_prefixes[index];
@@ -183,7 +186,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 +224,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 +281,25 @@ static void show_usage(void)
     printf("\n");
 }
 
-static void opt_input_file(const char *filename)
+static void opt_format(const char *arg)
 {
-    if (!strcmp(filename, "-"))
-        filename = "pipe:";
-    input_filename = filename;
+    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 (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,8 +319,9 @@ static void opt_pretty(void)
 
 static const OptionDef options[] = {
 #include "cmdutils_common_opts.h"
-    { "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"  },
+    { "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},
       "use binary prefixes for byte units" },
     { "sexagesimal", OPT_BOOL,  {(void*)&use_value_sexagesimal_format},
@@ -311,13 +329,16 @@ static const OptionDef options[] = {
     { "pretty", 0, {(void*)&opt_pretty},
       "prettify the format of displayed values, make it more human readable" },
     { "show_format",  OPT_BOOL, {(void*)&do_show_format} , "show format/container info" },
-    { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info"          },
+    { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" },
     { NULL, },
 };
 
 int main(int argc, char **argv)
 {
     av_register_all();
+#if CONFIG_AVDEVICE
+    avdevice_register_all();
+#endif
 
     show_banner();
     parse_options(argc, argv, options, opt_input_file);