Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'

[ffmpeg] / libavformat / id3v1.c

diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c
index 2d1e80692036653d16b779a118e80ede08fa3e3f..d73adc713b1fb4fa94df04ddde40dc326ced0b0f 100644 (file)
--- a/libavformat/id3v1.c
+++ b/libavformat/id3v1.c
@@ -23,6 +23,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavutil/dict.h"
 
+/* See Genre List at http://id3.org/id3v2.3.0 */
 const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
       [0] = "Blues",
       [1] = "Classic Rock",
@@ -91,7 +92,7 @@ const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
      [64] = "Native American",
      [65] = "Cabaret",
      [66] = "New Wave",
-     [67] = "Psychadelic",
+     [67] = "Psychadelic", /* sic, the misspelling is used in the specification */
      [68] = "Rave",
      [69] = "Showtunes",
      [70] = "Trailer",