diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-06-29 18:36:49 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-06-29 18:36:49 +0000 |
| commit | 3fd5a75b07b332f27e5f2ee51eff38d0e654def1 (patch) | |
| tree | 2b6f709c1ff8386364433f465c3098a8bc7fd7b9 /libavformat/id3v2.c | |
| parent | 29024501b70692e114b35578d006d9024feddacf (diff) | |
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
Diffstat (limited to 'libavformat/id3v2.c')
| -rw-r--r-- | libavformat/id3v2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9a2463808e..43775ce3c2 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); |