diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-06-15 19:53:15 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-06-15 19:53:15 +0000 |
| commit | 0ade7bb6e9a2631cd1068b974ec3fcf4fa9bdc41 (patch) | |
| tree | abca01f5304d81985c1ed8be6c5260b94157e28a /libavformat | |
| parent | 0884fadf68817e3325bbe82d875cf470238f44d1 (diff) | |
| download | ffmpeg-0ade7bb6e9a2631cd1068b974ec3fcf4fa9bdc41.tar.gz | |
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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files 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) |