1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

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
This commit is contained in:
Aurelien Jacobs 2010-06-15 19:53:15 +00:00
parent 0884fadf68
commit 0ade7bb6e9

View File

@ -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)