Commit 0ade7bb6 authored by Aurelien Jacobs's avatar Aurelien Jacobs

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
parent 0884fadf
...@@ -1158,7 +1158,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -1158,7 +1158,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
uint64_t max_start = 0; uint64_t max_start = 0;
Ebml ebml = { 0 }; Ebml ebml = { 0 };
AVStream *st; AVStream *st;
int i, j; int i, j, res;
matroska->ctx = s; matroska->ctx = s;
...@@ -1182,8 +1182,8 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -1182,8 +1182,8 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
ebml_free(ebml_syntax, &ebml); ebml_free(ebml_syntax, &ebml);
/* The next thing is a segment. */ /* The next thing is a segment. */
if (ebml_parse(matroska, matroska_segments, matroska) < 0) if ((res = ebml_parse(matroska, matroska_segments, matroska)) < 0)
return -1; return res;
matroska_execute_seekhead(matroska); matroska_execute_seekhead(matroska);
if (!matroska->time_scale) if (!matroska->time_scale)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment