diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-12-13 20:51:38 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-12-13 20:51:38 +0000 |
commit | 57f36fda5671f6d9b7fd5038aa01f69a82773e07 (patch) | |
tree | afca3901fd83842fa7bb4467c885ef0310ad6b71 /libavformat/id3v1.c | |
parent | 12ad66712a18d039eea73a742ae626b2376f8f4f (diff) | |
download | ffmpeg-57f36fda5671f6d9b7fd5038aa01f69a82773e07.tar.gz |
More ID3v1 genres from ffmbc.
Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/id3v1.c')
-rw-r--r-- | libavformat/id3v1.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c index cf5cb950c9..d201cde84a 100644 --- a/libavformat/id3v1.c +++ b/libavformat/id3v1.c @@ -149,6 +149,28 @@ const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = { [123] = "A capella", [124] = "Euro-House", [125] = "Dance Hall", + [126] = "Goa", + [127] = "Drum & Bass", + [128] = "Club-House", + [129] = "Hardcore", + [130] = "Terror", + [131] = "Indie", + [132] = "BritPop", + [133] = "Negerpunk", + [134] = "Polsk Punk", + [135] = "Beat", + [136] = "Christian Gangsta", + [137] = "Heavy Metal", + [138] = "Black Metal", + [139] = "Crossover", + [140] = "Contemporary C", + [141] = "Christian Rock", + [142] = "Merengue", + [143] = "Salsa", + [144] = "Thrash Metal", + [145] = "Anime", + [146] = "JPop", + [147] = "SynthPop", }; static void get_string(AVFormatContext *s, const char *key, |