projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bde51e6
)
matroskadec: move setting of matroska->done inside matroska_parse_cluster()
author
Aurelien Jacobs
<aurel@gnuage.org>
Sun, 24 Aug 2008 23:54:14 +0000
(23:54 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Sun, 24 Aug 2008 23:54:14 +0000
(23:54 +0000)
Originally committed as revision 14955 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/matroskadec.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskadec.c
b/libavformat/matroskadec.c
index
0901c57
..
ece7ecf
100644
(file)
--- 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;