OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5ca0c6
)
Better way to detect cluster (fix files encoded with Haali's muxer).
author
Aurelien Jacobs
<aurel@gnuage.org>
Wed, 8 Nov 2006 18:53:36 +0000
(18:53 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Wed, 8 Nov 2006 18:53:36 +0000
(18:53 +0000)
Originally committed as revision 6943 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/matroska.c
patch
|
blob
|
history
diff --git
a/libavformat/matroska.c
b/libavformat/matroska.c
index
eb13903
..
e4763f3
100644
(file)
--- a/
libavformat/matroska.c
+++ b/
libavformat/matroska.c
@@
-2143,11
+2143,8
@@
matroska_read_header (AVFormatContext *s,
}
}
- if (res < 0)
- return res;
-
/* Have we found a cluster? */
- if (
res == 1
) {
+ if (
ebml_peek_id(matroska, NULL) == MATROSKA_ID_CLUSTER
) {
int i, j;
MatroskaTrack *track;
AVStream *st;
@@
-2264,9
+2261,10
@@
matroska_read_header (AVFormatContext *s,
/* What do we do with private data? E.g. for Vorbis. */
}
+ res = 0;
}
- return
0
;
+ return
res
;
}
static int