oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder: use AVDictionary instead of AVMetadata

Browse Source 
AVMetadata has been deprecated.
This commit is contained in:
Max Kellermann
2011-07-18 23:29:42 +02:00
parent 762712c756
commit 6592ca9f88
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/decoder/ffmpeg_decoder_plugin.c
View File

@@ -446,13 +446,26 @@ static const ffmpeg_tag_map ffmpeg_tag_maps[] = {
}; };
static bool static bool
ffmpeg_copy_metadata(struct tag *tag, AVMetadata *m, ffmpeg_copy_metadata(struct tag *tag,
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0)
AVDictionary *m,
#else
AVMetadata *m,
#endif
const ffmpeg_tag_map tag_map) const ffmpeg_tag_map tag_map)
{ {
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0)
AVDictionaryEntry *mt = NULL;
while ((mt = av_dict_get(m, tag_map.name, mt, 0)) != NULL)
tag_add_item(tag, tag_map.type, mt->value);
#else
AVMetadataTag *mt = NULL; AVMetadataTag *mt = NULL;
while ((mt = av_metadata_get(m, tag_map.name, mt, 0)) != NULL) while ((mt = av_metadata_get(m, tag_map.name, mt, 0)) != NULL)
tag_add_item(tag, tag_map.type, mt->value); tag_add_item(tag, tag_map.type, mt->value);
#endif
return mt != NULL; return mt != NULL;
} }