From 653fb2f80cf94f6dd8bbaa6139feb94bf61926e5 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 24 Aug 2008 23:54:14 +0000 Subject: matroskadec: move setting of matroska->done inside matroska_parse_cluster() Originally committed as revision 14955 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/matroskadec.c') diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 0901c57afc..ece7ecf278 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1618,6 +1618,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) 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(AVFormatContext *s, AVPacket *pkt) 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; -- cgit v1.2.3