aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-08-13 09:36:45 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-08-13 09:36:45 +0000
commit131f1cb2a95b65cb338330fc51f4c24f7e523ebd (patch)
tree1dcc1c9f7b823204fba923a8b7a6eaf0aa7ba9d5
parentee5b34d56e7fa9c1eb1a2aeb2bf7b55516c99c8a (diff)
downloadffmpeg-131f1cb2a95b65cb338330fc51f4c24f7e523ebd.tar.gz
matroskadec: parse available blocks even when cluster parsing failed
This way, we still read the few complete blocks out of a truncated cluster at the end of a truncated file. Originally committed as revision 14723 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 89c0d67c36..b42da2699e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1601,7 +1601,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
res = ebml_parse(matroska, matroska_clusters, &cluster);
blocks_list = &cluster.blocks;
blocks = blocks_list->elem;
- for (i=0; !res && i<blocks_list->nb_elem; i++)
+ for (i=0; i<blocks_list->nb_elem; i++)
if (blocks[i].bin.size > 0)
res=matroska_parse_block(matroska,
blocks[i].bin.data, blocks[i].bin.size,