[FFmpeg-cvslog] mkv: forward EMBL block data error

Luca Barbato git at videolan.org
Mon Apr 30 22:46:08 CEST 2012


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sun Apr 29 17:39:31 2012 -0700| [721af294d9b7ba5df9ffe52b83254654c3d55f16] | committer: Luca Barbato

mkv: forward EMBL block data error

Do not return 0 on error.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=721af294d9b7ba5df9ffe52b83254654c3d55f16
---

 libavformat/matroskadec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index e45cfb0..5688658 100644
--- 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;



More information about the ffmpeg-cvslog mailing list