From 407d3d5a3a58971daf67c8fa52a0fc158682235e Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Tue, 7 Dec 2010 07:52:54 +0000
Subject: [PATCH] id3v2: skip encrypted/compressed frames
Originally committed as revision 25903 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/id3v2.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 874815a42d0..197aeac5b22 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -224,7 +224,10 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
next = url_ftell(s->pb) + tlen;
- if (tag[0] == 'T') {
+ 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);
+ } else if (tag[0] == 'T') {
if (unsync || tunsync) {
int i, j;
av_fast_malloc(&buffer, &buffer_size, tlen);
--
GitLab