OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb7d70c
)
avformat/avidec: Skip duplicate strf chunks
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Nov 2013 01:04:59 +0000
(
02:04
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Nov 2013 01:06:03 +0000
(
02:06
+0100)
Fixes Ticket3119
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index
8028ecb
..
6debfbe
100644
(file)
--- a/
libavformat/avidec.c
+++ b/
libavformat/avidec.c
@@
-623,6
+623,10
@@
static int avi_read_header(AVFormatContext *s)
if (cur_pos < list_end)
size = FFMIN(size, list_end - cur_pos);
st = s->streams[stream_index];
+ if (st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN) {
+ avio_skip(pb, size);
+ break;
+ }
switch (codec_type) {
case AVMEDIA_TYPE_VIDEO:
if (amv_file_format) {