Commit 2e3ca1ff authored by Jai Menon's avatar Jai Menon

Skip padding bytes correctly in ID3 tags.

This fixes a regression introduced in r20170.

Originally committed as revision 20238 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent aafd6595
...@@ -213,7 +213,12 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) ...@@ -213,7 +213,12 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
if (tag[0] == 'T') if (tag[0] == 'T')
read_ttag(s, tlen, tag); read_ttag(s, tlen, tag);
else if (!tag[0]) {
if (tag[1])
av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding");
url_fskip(s->pb, len);
break;
}
/* Skip to end of tag */ /* Skip to end of tag */
url_fseek(s->pb, next, SEEK_SET); url_fseek(s->pb, next, SEEK_SET);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment