OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
60178e7
)
lavf/mov: Only search for invalid moov in free if compliance < STRICT.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Tue, 1 Nov 2016 10:31:39 +0000
(11:31 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Tue, 1 Nov 2016 10:37:34 +0000
(11:37 +0100)
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
414007e
..
b4806f7
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-4884,6
+4884,7
@@
static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom)
a.type = avio_rl32(pb);
if (a.type == MKTAG('f','r','e','e') &&
a.size >= 8 &&
+ c->fc->strict_std_compliance < FF_COMPLIANCE_STRICT &&
c->moov_retry) {
uint8_t buf[8];
uint32_t *type = (uint32_t *)buf + 1;