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:
721af29
)
mkv: mark corrupted packets and return them
author
Luca Barbato
<lu_zero@gentoo.org>
Mon, 30 Apr 2012 00:55:51 +0000
(17:55 -0700)
committer
Luca Barbato
<lu_zero@gentoo.org>
Mon, 30 Apr 2012 03:22:09 +0000
(20:22 -0700)
Do return error if memory allocation or I/O fails.
libavformat/matroskadec.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskadec.c
b/libavformat/matroskadec.c
index
5688658
..
3b78ae3
100644
(file)
--- a/
libavformat/matroskadec.c
+++ b/
libavformat/matroskadec.c
@@
-2069,6
+2069,11
@@
static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = matroska_parse_cluster(matroska);
}
+ if (ret == AVERROR_INVALIDDATA) {
+ pkt->flags |= AV_PKT_FLAG_CORRUPT;
+ return 0;
+ }
+
return ret;
}