diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2006-11-08 18:53:36 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-11-08 18:53:36 +0000 |
commit | 95cc43b28bd000fb3fbd0b1273f7034b275f93b9 (patch) | |
tree | a2e15449fd1612bb99ef5a785282a012cbba2f5f /libavformat | |
parent | b5ca0c6ff9add05363088bd1944705c8d6b5c4a8 (diff) |
Better way to detect cluster (fix files encoded with Haali's muxer).
Originally committed as revision 6943 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/matroska.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index eb13903f8d..e4763f3848 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -2143,11 +2143,8 @@ matroska_read_header (AVFormatContext *s, } } - if (res < 0) - return res; - /* Have we found a cluster? */ - if (res == 1) { + if (ebml_peek_id(matroska, NULL) == MATROSKA_ID_CLUSTER) { int i, j; MatroskaTrack *track; AVStream *st; @@ -2264,9 +2261,10 @@ matroska_read_header (AVFormatContext *s, /* What do we do with private data? E.g. for Vorbis. */ } + res = 0; } - return 0; + return res; } static int |