decoder/mp4ff: remove duplicate entries in the tag name table

Reuse the function tag_name_parse_i().
This commit is contained in:
Max Kellermann 2010-06-30 21:36:15 +02:00
parent 8e3eace289
commit 5ebe33653c

View File

@ -341,14 +341,6 @@ mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
} }
static const char *const mp4ff_tag_names[TAG_NUM_OF_ITEM_TYPES] = { static const char *const mp4ff_tag_names[TAG_NUM_OF_ITEM_TYPES] = {
[TAG_ITEM_TITLE] = "title",
[TAG_ITEM_ARTIST] = "artist",
[TAG_ITEM_ALBUM] = "album",
[TAG_ITEM_ALBUM_ARTIST] = "albumartist",
[TAG_ITEM_TRACK] = "track",
[TAG_ITEM_DISC] = "disc",
[TAG_ITEM_GENRE] = "genre",
[TAG_ITEM_DATE] = "date",
[TAG_ITEM_COMPOSER] = "writer", [TAG_ITEM_COMPOSER] = "writer",
[TAG_ITEM_PERFORMER] = "band", [TAG_ITEM_PERFORMER] = "band",
}; };
@ -356,7 +348,11 @@ static const char *const mp4ff_tag_names[TAG_NUM_OF_ITEM_TYPES] = {
static enum tag_type static enum tag_type
mp4ff_tag_name_parse(const char *name) mp4ff_tag_name_parse(const char *name)
{ {
return tag_table_lookup(mp4ff_tag_names, name); enum tag_type type = tag_table_lookup(mp4ff_tag_names, name);
if (type == TAG_NUM_OF_ITEM_TYPES)
type = tag_name_parse_i(name);
return type;
} }
static struct tag * static struct tag *