[FFmpeg-cvslog] r23619 - trunk/libavformat/matroskadec.c
aurel
subversion
Tue Jun 15 21:53:15 CEST 2010
Author: aurel
Date: Tue Jun 15 21:53:15 2010
New Revision: 23619
Log:
matroskadec : propagate AVERROR to the caller
based on a patch by Jai Menon
Modified:
trunk/libavformat/matroskadec.c
Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c Tue Jun 15 21:44:30 2010 (r23618)
+++ trunk/libavformat/matroskadec.c Tue Jun 15 21:53:15 2010 (r23619)
@@ -1158,7 +1158,7 @@ static int matroska_read_header(AVFormat
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(AVFormat
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)
More information about the ffmpeg-cvslog
mailing list