Commit 01f24270 authored by mstorsjo's avatar mstorsjo

metadata: make conversion to the same format a noop.

Patch by Anton Khirnov, wyskas at gmail


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23466 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 26666bef
...@@ -117,9 +117,11 @@ void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv, ...@@ -117,9 +117,11 @@ void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
AVMetadata *dst = NULL; AVMetadata *dst = NULL;
const char *key; const char *key;
if (d_conv == s_conv)
return;
while((mtag=av_metadata_get(*pm, "", mtag, AV_METADATA_IGNORE_SUFFIX))) { while((mtag=av_metadata_get(*pm, "", mtag, AV_METADATA_IGNORE_SUFFIX))) {
key = mtag->key; key = mtag->key;
if (s_conv != d_conv) {
if (s_conv) if (s_conv)
for (sc=s_conv; sc->native; sc++) for (sc=s_conv; sc->native; sc++)
if (!strcasecmp(key, sc->native)) { if (!strcasecmp(key, sc->native)) {
...@@ -132,7 +134,6 @@ void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv, ...@@ -132,7 +134,6 @@ void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
key = dc->native; key = dc->native;
break; break;
} }
}
av_metadata_set2(&dst, key, mtag->value, 0); av_metadata_set2(&dst, key, mtag->value, 0);
} }
av_metadata_free(pm); av_metadata_free(pm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment