[FFmpeg-cvslog] r14955 - trunk/libavformat/matroskadec.c

[aurel]

Author: aurel
Date: Mon Aug 25 01:54:14 2008
New Revision: 14955

Log:
matroskadec: move setting of matroska->done inside matroska_parse_cluster()


Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Mon Aug 25 01:54:14 2008
@@ -1618,6 +1618,7 @@ static int matroska_parse_cluster(Matros
                                      blocks[i].bin.pos,  cluster.timecode,
                                      blocks[i].duration, !blocks[i].reference);
     ebml_free(matroska_cluster, &cluster);
+    if (res < 0)  matroska->done = 1;
     return res;
 }
 
@@ -1628,8 +1629,7 @@ static int matroska_read_packet(AVFormat
     while (matroska_deliver_packet(matroska, pkt)) {
         if (matroska->done)
             return AVERROR(EIO);
-        if (matroska_parse_cluster(matroska) < 0)
-            matroska->done = 1;
+        matroska_parse_cluster(matroska);
     }
 
     return 0;