[FFmpeg-cvslog] r25903 - trunk/libavformat/id3v2.c

[elenril]

Author: elenril
Date: Tue Dec  7 08:52:54 2010
New Revision: 25903

Log:
id3v2: skip encrypted/compressed frames

Modified:
   trunk/libavformat/id3v2.c

Modified: trunk/libavformat/id3v2.c
==============================================================================
--- trunk/libavformat/id3v2.c	Tue Dec  7 08:52:50 2010	(r25902)
+++ trunk/libavformat/id3v2.c	Tue Dec  7 08:52:54 2010	(r25903)
@@ -224,7 +224,10 @@ void ff_id3v2_parse(AVFormatContext *s, 
 
         next = url_ftell(s->pb) + tlen;
 
-        if (tag[0] == 'T') {
+        if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) {
+            av_log(s, AV_LOG_WARNING, "Skipping encrypted/compressed ID3v2 frame %s.\n", tag);
+            url_fskip(s->pb, tlen);
+        } else if (tag[0] == 'T') {
             if (unsync || tunsync) {
                 int i, j;
                 av_fast_malloc(&buffer, &buffer_size, tlen);