lavf/metadata: support duplicate keys in ff_metadata_conv

rcombs committed 4 years ago

Commit 172e7ca1 parent 19e9a203 files · +5 −5Browse files

Unified · Split

3 files

libavformat/metadata.c +1 −1
tests/ref/fate/cover-art-aiff-id3v2-remux +2 −2
tests/ref/fate/id3v2-utf16-bom +2 −2

libavformat/metadata.c+1−1

@@ -50,7 +50,7 @@ void ff_metadata_conv(AVDictionary *pm, const AVMetadataConv d_conv, · 49 unmodified lines
50	50	key = dc->native;
51	51	break;
52	52	}
53		− av_dict_set(&dst, key, mtag->value, 0);
	53	+ av_dict_set(&dst, key, mtag->value, AV_DICT_MULTIKEY \| AV_DICT_DEDUP);
54	54	}
55	55	av_dict_free(pm);
56	56	*pm = dst;

tests/ref/fate/cover-art-aiff-id3v2-remux+2−2

@@ -67,10 +67,10 @@ TAG:title=fourth · 66 unmodified lines
67	67	TAG:comment=Composer
68	68	[/STREAM]
69	69	[FORMAT]
70		−TAG:artist=Мельница
	70	+TAG:title=Дороги
71	71	TAG:RATING=0
72	72	TAG:album=Ангелофрения
73		−TAG:title=Дороги
	73	+TAG:artist=Мельница
74	74	TAG:tracktotal=11
75	75	TAG:totaltracks=11
76	76	TAG:genre=Folk

tests/ref/fate/id3v2-utf16-bom+2−2

@@ -30,10 +30,10 @@ TAG:title=Дороги · 29 unmodified lines
30	30	TAG:comment=Other
31	31	[/STREAM]
32	32	[FORMAT]
33		−TAG:artist=Мельница
	33	+TAG:title=Дороги
34	34	TAG:RATING=0
35	35	TAG:album=Ангелофрения
36		−TAG:title=Дороги
	36	+TAG:artist=Мельница
37	37	TAG:tracktotal=11
38	38	TAG:totaltracks=11
39	39	TAG:genre=Folk