patched ffmpeg nov 2

source/patched-ffmpeg-mt/libavformat/metadata.c

Index: source/patched-ffmpeg-mt/libavformat/metadata.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/metadata.c	(revision 65184)
+++ source/patched-ffmpeg-mt/libavformat/metadata.c	(working copy)
@@ -49,7 +49,7 @@
 int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags)
 {
     AVMetadata *m= *pm;
-    AVMetadataTag *tag= av_metadata_get(m, key, NULL, AV_METADATA_MATCH_CASE);
+    AVMetadataTag *tag= av_metadata_get(m, key, NULL, flags);
 
     if(!m)
         m=*pm= av_mallocz(sizeof(*m));
@@ -91,6 +91,12 @@
 {
     return av_metadata_set2(pm, key, value, 0);
 }
+
+void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                            const AVMetadataConv *s_conv)
+{
+    return;
+}
 #endif
 
 void av_metadata_free(AVMetadata **pm)
@@ -107,8 +113,8 @@
     av_freep(pm);
 }
 
-void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
-                                           const AVMetadataConv *s_conv)
+void ff_metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+                                       const AVMetadataConv *s_conv)
 {
     /* TODO: use binary search to look up the two conversion tables
        if the tables are getting big enough that it would matter speed wise */
@@ -140,15 +146,15 @@
     *pm = dst;
 }
 
-void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
-                                            const AVMetadataConv *s_conv)
+void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                                const AVMetadataConv *s_conv)
 {
     int i;
-    metadata_conv(&ctx->metadata, d_conv, s_conv);
+    ff_metadata_conv(&ctx->metadata, d_conv, s_conv);
     for (i=0; i<ctx->nb_streams ; i++)
-        metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
+        ff_metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
     for (i=0; i<ctx->nb_chapters; i++)
-        metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
+        ff_metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
     for (i=0; i<ctx->nb_programs; i++)
-        metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
+        ff_metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
 }