Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / metadata.c

diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index e6b0d54cf76aa36b5ff6dbbd90c567236268df5d..74e6c8df9a3e76973b2a2a04a6880596d418fc22 100644 (file)
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -49,7 +49,7 @@ av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int f
 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));
@@ -86,10 +86,11 @@ int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int fl
     return 0;
 }
 
-#if LAVF_API_OLD_METADATA
-int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
+#if FF_API_OLD_METADATA2
+void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                            const AVMetadataConv *s_conv)
 {
-    return av_metadata_set2(pm, key, value, 0);
+    return;
 }
 #endif
 
@@ -107,8 +108,8 @@ void av_metadata_free(AVMetadata **pm)
     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 +141,23 @@ void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
     *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);
+}
+
+void av_metadata_copy(AVMetadata **dst, AVMetadata *src, int flags)
+{
+    AVMetadataTag *t = NULL;
+
+    while ((t = av_metadata_get(src, "", t, AV_METADATA_IGNORE_SUFFIX)))
+        av_metadata_set2(dst, t->key, t->value, flags);
 }