summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/id3.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index 1613e3a19..bcb07e7e4 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -45,7 +45,7 @@
#include "bswap.h"
#include "id3.h"
-#define ID3_GENRE_COUNT 126
+#define ID3_GENRE_COUNT 148
static const char* const id3_genre[] =
{"Blues", "Classic Rock", "Country", "Dance", "Disco",
"Funk", "Grunge", "Hip-Hop", "Jazz", "Metal",
@@ -72,7 +72,11 @@ static const char* const id3_genre[] =
"Satire", "Slow Jam", "Club", "Tango", "Samba",
"Folklore", "Ballad", "Power Ballad", "Rhythmic Soul", "Freestyle",
"Duet", "Punk Rock", "Drum Solo", "A capella", "Euro-House",
- "Dance Hall" };
+ "Dance Hall", "Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror",
+ "Indie", "BritPop", "Negerpunk", "Polsk Punk", "Beat",
+ "Christian Gangsta Rap", "Heavy Metal", "Black Metal", "Crossover",
+ "Contemporary Christian", "Christian Rock", "Merengue", "Salsa",
+ "Thrash Metal", "Anime", "JPop", "Synthpop" };
#define ID3_ENCODING_COUNT 4
static const char* const id3_encoding[] = {
@@ -598,7 +602,7 @@ static int id3v24_parse_genre(char* dest, char *src, int len) {
int index = 0;
dest[0] = '\0';
- if (sscanf(src, "%2d", &index) == 1) {
+ if (sscanf(src, "%d", &index) == 1) {
if (index < ID3_GENRE_COUNT) {
strncpy(dest, id3_genre[index], len);
dest[len - 1] = '\0';