]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
handle id3v2 'genre' tag formated as '%d'
authoraurel <aurel@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sun, 22 Mar 2009 16:10:37 +0000 (16:10 +0000)
committeraurel <aurel@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sun, 22 Mar 2009 16:10:37 +0000 (16:10 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18145 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/mp3.c

index fa383d65126c3eeaa306f192562e002edbb57b59..b032f0c09e666ed48300adcf4a6397ceb7f51a8d 100644 (file)
@@ -198,7 +198,8 @@ static void id3v2_read_ttag(AVFormatContext *s, int taglen, const char *key)
     }
 
     if (!strcmp(key, "genre")
-        && sscanf(dst, "(%d)", &genre) == 1 && genre <= ID3v1_GENRE_MAX)
+        && (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1)
+        && genre <= ID3v1_GENRE_MAX)
         av_strlcpy(dst, id3v1_genre_str[genre], sizeof(dst));
 
     if (*dst)