From 083340a9373537faacf67cc2ba8bc82238e104c4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 3 Feb 2012 09:18:05 +0100 Subject: decoder/ffmpeg: use sentinel for the ffmpeg_tag_maps table Minor optimisation. --- src/decoder/ffmpeg_decoder_plugin.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 2616d95c7..b3c3744a1 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -594,6 +594,9 @@ static const ffmpeg_tag_map ffmpeg_tag_maps[] = { { TAG_ARTIST_SORT, "author-sort" }, { TAG_ALBUM_ARTIST, "album_artist" }, { TAG_ALBUM_ARTIST_SORT, "album_artist-sort" }, + + /* sentinel */ + { TAG_NUM_OF_ITEM_TYPES, NULL } }; #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0) @@ -619,9 +622,9 @@ ffmpeg_copy_dictionary(struct tag *tag, AVDictionary *dict) ffmpeg_copy_metadata(tag, i, dict, tag_item_names[i]); - for (unsigned i = 0; i < G_N_ELEMENTS(ffmpeg_tag_maps); i++) - ffmpeg_copy_metadata(tag, ffmpeg_tag_maps[i].type, - dict, ffmpeg_tag_maps[i].name); + for (const struct ffmpeg_tag_map *i = ffmpeg_tag_maps; + i->name != NULL; ++i) + ffmpeg_copy_metadata(tag, i->type, dict, i->name); } #endif -- cgit v1.2.3