Commit 40b12d95 authored by aurel's avatar aurel

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14955 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 98c95722
...@@ -1618,6 +1618,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) ...@@ -1618,6 +1618,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
blocks[i].bin.pos, cluster.timecode, blocks[i].bin.pos, cluster.timecode,
blocks[i].duration, !blocks[i].reference); blocks[i].duration, !blocks[i].reference);
ebml_free(matroska_cluster, &cluster); ebml_free(matroska_cluster, &cluster);
if (res < 0) matroska->done = 1;
return res; return res;
} }
...@@ -1628,8 +1629,7 @@ static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -1628,8 +1629,7 @@ static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt)
while (matroska_deliver_packet(matroska, pkt)) { while (matroska_deliver_packet(matroska, pkt)) {
if (matroska->done) if (matroska->done)
return AVERROR(EIO); return AVERROR(EIO);
if (matroska_parse_cluster(matroska) < 0) matroska_parse_cluster(matroska);
matroska->done = 1;
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment