From 0ade7bb6e9a2631cd1068b974ec3fcf4fa9bdc41 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Tue, 15 Jun 2010 19:53:15 +0000 Subject: [PATCH] matroskadec : propagate AVERROR to the caller based on a patch by Jai Menon Originally committed as revision 23619 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 7995ce5906..69c81b0ae8 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1158,7 +1158,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) uint64_t max_start = 0; Ebml ebml = { 0 }; AVStream *st; - int i, j; + int i, j, res; matroska->ctx = s; @@ -1182,8 +1182,8 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) ebml_free(ebml_syntax, &ebml); /* The next thing is a segment. */ - if (ebml_parse(matroska, matroska_segments, matroska) < 0) - return -1; + if ((res = ebml_parse(matroska, matroska_segments, matroska)) < 0) + return res; matroska_execute_seekhead(matroska); if (!matroska->time_scale)