OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a07d15
)
id3v2: skip encrypted/compressed frames
author
Anton Khirnov
<wyskas@gmail.com>
Tue, 7 Dec 2010 07:52:54 +0000
(07:52 +0000)
committer
Anton Khirnov
<wyskas@gmail.com>
Tue, 7 Dec 2010 07:52:54 +0000
(07:52 +0000)
Originally committed as revision 25903 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/id3v2.c
patch
|
blob
|
history
diff --git
a/libavformat/id3v2.c
b/libavformat/id3v2.c
index
874815a
..
197aeac
100644
(file)
--- 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);