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

[michael]

Author: michael
Date: Mon Jun 29 20:36:49 2009
New Revision: 19291

Log:
id3v2.4.0 uses syncsafe integers for sizes of frames.
Fixes issue1234
Fixes regression introduced in r19275

Modified:
   trunk/libavformat/id3v2.c

Modified: trunk/libavformat/id3v2.c
==============================================================================
--- trunk/libavformat/id3v2.c	Mon Jun 29 11:02:07 2009	(r19290)
+++ trunk/libavformat/id3v2.c	Mon Jun 29 20:36:49 2009	(r19291)
@@ -155,7 +155,10 @@ void ff_id3v2_parse(AVFormatContext *s, 
     while (len >= taghdrlen) {
         if (isv34) {
             tag  = get_be32(s->pb);
+            if(version==3){
             tlen = get_be32(s->pb);
+            }else
+                tlen = get_size(s->pb, 4);
             get_be16(s->pb); /* flags */
         } else {
             tag  = get_be24(s->pb);