# HG changeset patch
# User michael
# Date 1260737498 0
# Node ID 1c7cdbafd33c0fa309728670169762f3ad4992a4
# Parent  4211f91f69b1ec9fd9268247b38510533fa97542
More ID3v1 genres from ffmbc.

diff -r 4211f91f69b1 -r 1c7cdbafd33c id3v1.c
--- a/id3v1.c	Sun Dec 13 20:27:29 2009 +0000
+++ b/id3v1.c	Sun Dec 13 20:51:38 2009 +0000
@@ -149,6 +149,28 @@
     [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 -r 4211f91f69b1 -r 1c7cdbafd33c id3v1.h
--- a/id3v1.h	Sun Dec 13 20:27:29 2009 +0000
+++ b/id3v1.h	Sun Dec 13 20:51:38 2009 +0000
@@ -26,7 +26,7 @@
 
 #define ID3v1_TAG_SIZE 128
 
-#define ID3v1_GENRE_MAX 125
+#define ID3v1_GENRE_MAX 147
 
 /**
  * ID3v1 genres