From 57f36fda5671f6d9b7fd5038aa01f69a82773e07 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 13 Dec 2009 20:51:38 +0000
Subject: [PATCH] More ID3v1 genres from ffmbc.
Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/id3v1.c | 22 ++++++++++++++++++++++
libavformat/id3v1.h | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c
index cf5cb950c98..d201cde84ad 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,
diff --git a/libavformat/id3v1.h b/libavformat/id3v1.h
index 206cab78ea6..8eb58be2d1e 100644
--- a/libavformat/id3v1.h
+++ b/libavformat/id3v1.h
@@ -26,7 +26,7 @@
#define ID3v1_TAG_SIZE 128
-#define ID3v1_GENRE_MAX 125
+#define ID3v1_GENRE_MAX 147
/**
* ID3v1 genres
--
GitLab