[FFmpeg-cvslog] r20837 - in trunk/libavformat: id3v1.c id3v1.h
michael
subversion
Sun Dec 13 21:51:38 CET 2009
Author: michael
Date: Sun Dec 13 21:51:38 2009
New Revision: 20837
Log:
More ID3v1 genres from ffmbc.
Modified:
trunk/libavformat/id3v1.c
trunk/libavformat/id3v1.h
Modified: trunk/libavformat/id3v1.c
==============================================================================
--- trunk/libavformat/id3v1.c Sun Dec 13 21:27:29 2009 (r20836)
+++ trunk/libavformat/id3v1.c Sun Dec 13 21:51:38 2009 (r20837)
@@ -149,6 +149,28 @@ const char * const ff_id3v1_genre_str[ID
[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,
Modified: trunk/libavformat/id3v1.h
==============================================================================
--- trunk/libavformat/id3v1.h Sun Dec 13 21:27:29 2009 (r20836)
+++ trunk/libavformat/id3v1.h Sun Dec 13 21:51:38 2009 (r20837)
@@ -26,7 +26,7 @@
#define ID3v1_TAG_SIZE 128
-#define ID3v1_GENRE_MAX 125
+#define ID3v1_GENRE_MAX 147
/**
* ID3v1 genres
More information about the ffmpeg-cvslog
mailing list