[SCM] libav/experimental: ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv() patch by Anton Khirnov anton _at_ khirnov _dot_ net

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a7e5a832c4839f83ea270886f7400efb56307f6e
Author: Anton Khirnov <wyskas at gmail.com>
Date:   Sat Oct 16 13:04:27 2010 +0000

    ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv()
    patch by Anton Khirnov  anton _at_ khirnov _dot_ net
    
    Originally committed as revision 25503 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 500ec15..999cb46 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2398,8 +2398,6 @@ static int transcode(AVFormatContext **output_files,
         mtag=NULL;
         while((mtag=av_metadata_get(in_file->metadata, "", mtag, AV_METADATA_IGNORE_SUFFIX)))
             av_metadata_set2(&out_file->metadata, mtag->key, mtag->value, AV_METADATA_DONT_OVERWRITE);
-        av_metadata_conv(out_file, out_file->oformat->metadata_conv,
-                                    in_file->iformat->metadata_conv);
     }
 
     /* copy chapters from the first input file that has them*/
@@ -3763,7 +3761,6 @@ static void opt_output_file(const char *filename)
             av_metadata_set2(&oc->metadata, metadata[metadata_count-1].key,
                                             metadata[metadata_count-1].value, 0);
         }
-        av_metadata_conv(oc, oc->oformat->metadata_conv, NULL);
     }
 
     output_files[nb_output_files++] = oc;
diff --git a/ffprobe.c b/ffprobe.c
index ac908e1..9625a52 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -35,7 +35,6 @@ static int do_show_format  = 0;
 static int do_show_packets = 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;
@@ -255,8 +254,6 @@ 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));
 
-    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);
 
@@ -372,7 +369,6 @@ static void opt_pretty(void)
 
 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" },

-- 
Libav/FFmpeg packaging