Better way to detect cluster (fix files encoded with Haali's muxer).

Originally committed as revision 6943 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2006-11-08 18:53:36 +00:00
parent b5ca0c6ff9
commit 95cc43b28b

View File

@ -2143,11 +2143,8 @@ matroska_read_header (AVFormatContext *s,
} }
} }
if (res < 0)
return res;
/* Have we found a cluster? */ /* Have we found a cluster? */
if (res == 1) { if (ebml_peek_id(matroska, NULL) == MATROSKA_ID_CLUSTER) {
int i, j; int i, j;
MatroskaTrack *track; MatroskaTrack *track;
AVStream *st; AVStream *st;
@ -2264,9 +2261,10 @@ matroska_read_header (AVFormatContext *s,
/* What do we do with private data? E.g. for Vorbis. */ /* What do we do with private data? E.g. for Vorbis. */
} }
res = 0;
} }
return 0; return res;
} }
static int static int