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

[aurel]

Author: aurel
Date: Sun Nov 12 17:59:27 2006
New Revision: 6989

Modified:
   trunk/libavformat/matroska.c

Log:
Allows playback of truncated matroska files.


Modified: trunk/libavformat/matroska.c
==============================================================================
--- trunk/libavformat/matroska.c	(original)
+++ trunk/libavformat/matroska.c	Sun Nov 12 17:59:27 2006
@@ -1942,7 +1942,7 @@
                         /* check ID */
                         if (!(id = ebml_peek_id (matroska,
                                                  &matroska->level_up)))
-                            break;
+                            goto finish;
                         if (id != seek_id) {
                             av_log(matroska->ctx, AV_LOG_INFO,
                                    "We looked for ID=0x%x but got "
@@ -1954,7 +1954,7 @@
 
                         /* read master + parse */
                         if ((res = ebml_read_master(matroska, &id)) < 0)
-                            break;
+                            goto finish;
                         switch (id) {
                             case MATROSKA_ID_CUES:
                                 if (!(res = matroska_parse_index(matroska)) ||
@@ -1971,8 +1971,6 @@
                                 }
                                 break;
                         }
-                        if (res < 0)
-                            break;
 
                     finish:
                         /* remove dummy level */