[Ffmpeg-cvslog] r6943 - trunk/libavformat/matroska.c

[aurel]

Author: aurel
Date: Wed Nov  8 19:53:36 2006
New Revision: 6943

Modified:
   trunk/libavformat/matroska.c

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


Modified: trunk/libavformat/matroska.c
==============================================================================
--- trunk/libavformat/matroska.c	(original)
+++ trunk/libavformat/matroska.c	Wed Nov  8 19:53:36 2006
@@ -2143,11 +2143,8 @@
         }
     }
 
-    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 @@
 
             /* What do we do with private data? E.g. for Vorbis. */
         }
+        res = 0;
     }
 
-    return 0;
+    return res;
 }
 
 static int