Implement -convert_tags option, which converts showed tag names to the

[ffmpeg.git] / ffprobe.c

diff --git a/ffprobe.c b/ffprobe.c
index 512777c..35bbe9f 100644 (file)
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#undef HAVE_AV_CONFIG_H

 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/opt.h"
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/opt.h"


@@ -35,6 +34,7 @@ const int program_birth_year = 2007;
 static int do_show_format  = 0;
 static int do_show_streams = 0;
 
 static int do_show_format  = 0;
 static int do_show_streams = 0;
 

+static int convert_tags                 = 0;

 static int show_value_unit              = 0;
 static int use_value_prefix             = 0;
 static int use_byte_value_binary_prefix = 0;
 static int show_value_unit              = 0;
 static int use_value_prefix             = 0;
 static int use_byte_value_binary_prefix = 0;


@@ -119,7 +119,7 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
     AVCodecContext *dec_ctx;
     AVCodec *dec;
     char val_str[128];
     AVCodecContext *dec_ctx;
     AVCodec *dec;
     char val_str[128];

-    AVMetadataTag *tag;
+    AVMetadataTag *tag = NULL;

     char a, b, c, d;
 
     printf("[STREAM]\n");
     char a, b, c, d;
 
     printf("[STREAM]\n");


@@ -212,6 +212,8 @@ static void show_format(AVFormatContext *fmt_ctx)
     printf("bit_rate=%s\n",         value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate,
                                                  unit_bit_per_second_str));
 
     printf("bit_rate=%s\n",         value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate,
                                                  unit_bit_per_second_str));
 

+    if (convert_tags)
+        av_metadata_conv(fmt_ctx, NULL, fmt_ctx->iformat->metadata_conv);

     while ((tag = av_metadata_get(fmt_ctx->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX)))
         printf("TAG:%s=%s\n", tag->key, tag->value);
 
     while ((tag = av_metadata_get(fmt_ctx->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX)))
         printf("TAG:%s=%s\n", tag->key, tag->value);
 


@@ -320,6 +322,7 @@ static void opt_pretty(void)
 
 static const OptionDef options[] = {
 #include "cmdutils_common_opts.h"
 
 static const OptionDef options[] = {
 #include "cmdutils_common_opts.h"

+    { "convert_tags", OPT_BOOL, {(void*)&convert_tags}, "convert tag names to the FFmpeg generic tag names" },

     { "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" },
     { "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" },