Skip short padding in id3v2.

Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24567 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alexander Kojevnikov 2010-07-28 08:06:52 +00:00 committed by Carl Eugen Hoyos
parent 53cf47829a
commit ff58de29f1
1 changed files with 5 additions and 1 deletions

View File

@ -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;