diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-12-10 15:48:56 +0000 |
|---|---|---|
| committer | Anton Khirnov <wyskas@gmail.com> | 2010-12-10 15:48:56 +0000 |
| commit | a152c77f26a6a56ed997651ec83d37d9cfaea92e (patch) | |
| tree | 0b3d48e2c594c4c081b17e98390932819a4161c2 | |
| parent | ded38a9bf03d833667725c3d4b50fffc557d2520 (diff) | |
| download | ffmpeg-a152c77f26a6a56ed997651ec83d37d9cfaea92e.tar.gz | |
id3v2: skip data length indicator
Originally committed as revision 25926 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/id3v2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 197aeac5b2..b32ca7d94f 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -224,6 +224,11 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) next = url_ftell(s->pb) + tlen; + if (tflags & ID3v2_FLAG_DATALEN) { + get_be32(s->pb); + tlen -= 4; + } + if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) { av_log(s, AV_LOG_WARNING, "Skipping encrypted/compressed ID3v2 frame %s.\n", tag); url_fskip(s->pb, tlen); |