Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2014-08-09 15:39:46 +0400
committerHendrik Leppkes <h.leppkes@gmail.com>2017-08-04 20:12:13 +0300
commit2cf675572f0942679e96de292078e9879247372b (patch)
treeaa03d3aa649d6fb367ed54b6c955fc4d93396b2f
parent4132906b3fb9277f14a4e1b34f069a8ad980a7cc (diff)
matroskadec_haali: relax cluster and frame size checks
Otherwise files with huge frames (uncompressed/ProRes/...) can't play properly at 4K
-rw-r--r--libavformat/MatroskaParser.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/MatroskaParser.c b/libavformat/MatroskaParser.c
index f3e473ec17..322612eb16 100644
--- a/libavformat/MatroskaParser.c
+++ b/libavformat/MatroskaParser.c
@@ -67,7 +67,7 @@
#define MAX_TRACKS 64
#define MAX_READAHEAD (256*1024)
-#define MAXCLUSTER (64*1048576)
+#define MAXCLUSTER (256*1048576)
#define MAXFRAME (4*1048576)
#if defined(_WIN32) && defined(_MSC_VER)
@@ -2521,8 +2521,6 @@ static int readMoreBlocks(MatroskaFile *mf) {
ENDFOR(mf);
out:;
} else {
- if (toplen > MAXFRAME)
- errorjmp(mf,"Element in a cluster is too large around %llu, %X [%u]",filepos(mf),cid,(unsigned)toplen);
if (cid == 0xa0) // BlockGroup
parseBlockGroup(mf,toplen,mf->tcCluster, 0);
else if (cid == 0xa3) // BlockEx