diff options
| author | Alexander Kojevnikov <alexander@kojevnikov.com> | 2010-07-28 08:06:52 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-07-28 08:06:52 +0000 |
| commit | ff58de29f1361789b6fc9c35a633e9e706172e09 (patch) | |
| tree | fcd766684af29e48ed1c8932c2b9844b27ad1eda /libavformat/id3v2.c | |
| parent | 53cf47829a1b77cd71f31a52a80349f72a972bc0 (diff) | |
| download | ffmpeg-ff58de29f1361789b6fc9c35a633e9e706172e09.tar.gz | |
Skip short padding in id3v2.
Patch by Alexander Kojevnikov, alexander kojevnikov com
Originally committed as revision 24567 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/id3v2.c')
| -rw-r--r-- | libavformat/id3v2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 7e4a16fae8..1f513d9196 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -217,13 +217,17 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) 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; |