From: Yann Collet <cyan@fb.com>
Date: Sat, 19 May 2018 00:17:45 +0000 (-0700)
Subject: Merge branch 'dev' into tableLevels
X-Git-Tag: v1.3.5~3^2~49^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5381369cb1b72e3c31abfa8d4ff71183a05586bf;p=thirdparty%2Fzstd.git

Merge branch 'dev' into tableLevels
---

5381369cb1b72e3c31abfa8d4ff71183a05586bf
diff --cc lib/compress/zstd_compress.c
index faecad40f,d4191afa1..d8420a8a6
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -3515,11 -3527,11 +3527,11 @@@ static const ZSTD_compressionParameter
      { 14, 15, 15,  6,  3, 64, ZSTD_btopt   },  /* level 15.*/
      { 14, 15, 15,  6,  3, 96, ZSTD_btopt   },  /* level 16.*/
      { 14, 15, 15,  6,  3,128, ZSTD_btopt   },  /* level 17.*/
-     { 14, 15, 15,  7,  3,256, ZSTD_btopt   },  /* level 18.*/
 -    { 14, 15, 15,  6,  3,256, ZSTD_btopt   },  /* level 18.*/
 -    { 14, 15, 15,  7,  3,256, ZSTD_btopt   },  /* level 19.*/
++    { 14, 15, 15,  8,  3,256, ZSTD_btopt   },  /* level 18.*/
 +    { 14, 15, 15,  6,  3,256, ZSTD_btultra },  /* level 19.*/
      { 14, 15, 15,  8,  3,256, ZSTD_btultra },  /* level 20.*/
      { 14, 15, 15,  9,  3,256, ZSTD_btultra },  /* level 21.*/
-     { 14, 15, 15, 10,  3,256, ZSTD_btultra },  /* level 22.*/
+     { 14, 15, 15, 10,  3,512, ZSTD_btultra },  /* level 22.*/
  },
  };