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

decoder/ffmpeg: add macros emulating AVDictionary

Browse Source 
Move the #ifdefs out of _copy_metadata().
This commit is contained in:
Max Kellermann 2012-02-03 09:02:14 +01:00
parent f370911c15
commit 001e2a604b
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/decoder/ffmpeg_decoder_plugin.c
View File

@ -607,26 +607,20 @@ static const ffmpeg_tag_map ffmpeg_tag_maps[] = {
{ TAG_DISC, "disc" }, { TAG_DISC, "disc" },
}; };
static void #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0)
ffmpeg_copy_metadata(struct tag *tag, #define AVDictionary AVMetadata
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0) #define AVDictionaryEntry AVMetadataTag
AVDictionary *m, #define av_dict_get av_metadata_get
#else
AVMetadata *m,
#endif #endif
static void
ffmpeg_copy_metadata(struct tag *tag, AVDictionary *m,
const ffmpeg_tag_map tag_map) const ffmpeg_tag_map tag_map)
{ {
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
AVDictionaryEntry *mt = NULL; AVDictionaryEntry *mt = NULL;
while ((mt = av_dict_get(m, tag_map.name, mt, 0)) != NULL) while ((mt = av_dict_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);
#else
AVMetadataTag *mt = NULL;
while ((mt = av_metadata_get(m, tag_map.name, mt, 0)) != NULL)
tag_add_item(tag, tag_map.type, mt->value);
#endif
} }
#endif #endif