From 3fd5a75b07b332f27e5f2ee51eff38d0e654def1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michaelni@gmx.at> Date: Mon, 29 Jun 2009 18:36:49 +0000 Subject: [PATCH] id3v2.4.0 uses syncsafe integers for sizes of frames. Fixes issue1234 Fixes regression introduced in r19275 Originally committed as revision 19291 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/id3v2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9a2463808e4..43775ce3c26 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -155,7 +155,10 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) 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); -- GitLab