Merge branch 'dev' into newFormats

Fixed conflicts in zstdmt_compress.c
2017-09-27 16:39:40 -07:00
parent ea1f50bf73 e45a2aea9b
commit 54a827fff0
24 changed files with 449 additions and 252 deletions
@@ -102,6 +102,7 @@ static const U32 repStartValue[ZSTD_REP_NUM] = { 1, 4, 8 };
 #define BIT0   1

 #define ZSTD_WINDOWLOG_ABSOLUTEMIN 10
+#define ZSTD_WINDOWLOG_DEFAULTMAX 27 /* Default maximum allowed window log */
 static const size_t ZSTD_fcs_fieldSize[4] = { 0, 2, 4, 8 };
 static const size_t ZSTD_did_fieldSize[4] = { 0, 1, 2, 4 };