[FFmpeg-cvslog] lavf/metadata: support duplicate keys in ff_metadata_conv

[rcombs]

ffmpeg | branch: master | rcombs <rcombs at rcombs.me> | Wed Aug 24 19:27:21 2022 -0500| [172e7ca668d7dde5c32133d0685a4b2829a8775d] | committer: Michael Niedermayer

lavf/metadata: support duplicate keys in ff_metadata_conv

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=172e7ca668d7dde5c32133d0685a4b2829a8775d
---

 libavformat/metadata.c                    | 2 +-
 tests/ref/fate/cover-art-aiff-id3v2-remux | 4 ++--
 tests/ref/fate/id3v2-utf16-bom            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index a0258ea125..d5c0a45bbe 100644
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -50,7 +50,7 @@ void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
                     key = dc->native;
                     break;
                 }
-        av_dict_set(&dst, key, mtag->value, 0);
+        av_dict_set(&dst, key, mtag->value, AV_DICT_MULTIKEY | AV_DICT_DEDUP);
     }
     av_dict_free(pm);
     *pm = dst;
diff --git a/tests/ref/fate/cover-art-aiff-id3v2-remux b/tests/ref/fate/cover-art-aiff-id3v2-remux
index a59ba37c65..b9c6333f7e 100644
--- a/tests/ref/fate/cover-art-aiff-id3v2-remux
+++ b/tests/ref/fate/cover-art-aiff-id3v2-remux
@@ -67,10 +67,10 @@ TAG:title=fourth
 TAG:comment=Composer
 [/STREAM]
 [FORMAT]
-TAG:artist=Мельница
+TAG:title=Дороги
 TAG:RATING=0
 TAG:album=Ангелофрения
-TAG:title=Дороги
+TAG:artist=Мельница
 TAG:tracktotal=11
 TAG:totaltracks=11
 TAG:genre=Folk
diff --git a/tests/ref/fate/id3v2-utf16-bom b/tests/ref/fate/id3v2-utf16-bom
index dd2566de2b..99d1bd064d 100644
--- a/tests/ref/fate/id3v2-utf16-bom
+++ b/tests/ref/fate/id3v2-utf16-bom
@@ -30,10 +30,10 @@ TAG:title=Дороги
 TAG:comment=Other
 [/STREAM]
 [FORMAT]
-TAG:artist=Мельница
+TAG:title=Дороги
 TAG:RATING=0
 TAG:album=Ангелофрения
-TAG:title=Дороги
+TAG:artist=Мельница
 TAG:tracktotal=11
 TAG:totaltracks=11
 TAG:genre=Folk