Browse Source

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

Originally committed as revision 14955 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Aurelien Jacobs 17 years ago
parent
commit
653fb2f80c
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavformat/matroskadec.c

+ 2
- 2
libavformat/matroskadec.c View File

@@ -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;


Loading…
Cancel
Save