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:
85395ba
)
mkv: forward EMBL block data error
author
Luca Barbato
<lu_zero@gentoo.org>
Mon, 30 Apr 2012 00:39:31 +0000
(17:39 -0700)
committer
Luca Barbato
<lu_zero@gentoo.org>
Mon, 30 Apr 2012 03:22:09 +0000
(20:22 -0700)
Do not return 0 on error.
libavformat/matroskadec.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskadec.c
b/libavformat/matroskadec.c
index
e45cfb0
..
5688658
100644
(file)
--- a/
libavformat/matroskadec.c
+++ b/
libavformat/matroskadec.c
@@
-1717,7
+1717,7
@@
static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if ((n = matroska_ebmlnum_uint(matroska, data, size, &num)) < 0) {
av_log(matroska->ctx, AV_LOG_ERROR, "EBML block data error\n");
- return
res
;
+ return
n
;
}
data += n;
size -= n;