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

[cehoyos]

Author: cehoyos
Date: Wed Jul 28 10:06:52 2010
New Revision: 24567

Log:
Skip short padding in id3v2.

Patch by Alexander Kojevnikov, alexander kojevnikov com

Modified:
   trunk/libavformat/id3v2.c

Modified: trunk/libavformat/id3v2.c
==============================================================================
--- trunk/libavformat/id3v2.c	Wed Jul 28 10:02:35 2010	(r24566)
+++ trunk/libavformat/id3v2.c	Wed Jul 28 10:06:52 2010	(r24567)
@@ -217,13 +217,17 @@ void ff_id3v2_parse(AVFormatContext *s, 
         else if (!tag[0]) {
             if (tag[1])
                 av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding");
-            url_fskip(s->pb, len);
+            url_fskip(s->pb, tlen);
             break;
         }
         /* Skip to end of tag */
         url_fseek(s->pb, next, SEEK_SET);
     }
 
+    if (len > 0) {
+        /* Skip padding */
+        url_fskip(s->pb, len);
+    }
     if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
         url_fskip(s->pb, 10);
     return;