diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-12-07 07:52:54 +0000 |
|---|---|---|
| committer | Anton Khirnov <wyskas@gmail.com> | 2010-12-07 07:52:54 +0000 |
| commit | 407d3d5a3a58971daf67c8fa52a0fc158682235e (patch) | |
| tree | 63f7a273c1d83fab81e9b6682eff6ba590851ff7 | |
| parent | 7a07d158bde2f75a53211acb683dc73dec21dd1a (diff) | |
| download | ffmpeg-streaming-407d3d5a3a58971daf67c8fa52a0fc158682235e.zip ffmpeg-streaming-407d3d5a3a58971daf67c8fa52a0fc158682235e.tar.gz | |
id3v2: skip encrypted/compressed frames
Originally committed as revision 25903 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/id3v2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 874815a..197aeac 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); |
