From: Yann Collet <cyan@fb.com>
Date: Wed, 17 Jan 2018 21:51:03 +0000 (-0800)
Subject: Merge branch 'dev' into progressiveMT
X-Git-Tag: v1.3.4~1^2~74^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b86865323a1bdce609465f9a251cf649fda26d6a;p=thirdparty%2Fzstd.git

Merge branch 'dev' into progressiveMT

fixed minor conflict on cdict
---

b86865323a1bdce609465f9a251cf649fda26d6a
diff --cc lib/compress/zstd_compress.c
index 5cc02bcc3,4ad5a6e61..bbe9146bd
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -2578,9 -2669,8 +2675,10 @@@ ZSTD_CDict* ZSTD_initStaticCDict(void* 
      return cdict;
  }
  
--ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict) {
++ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict)
++{
 +    assert(cdict != NULL);
-     return cdict->refContext->appliedParams.cParams;
+     return cdict->cParams;
  }
  
  /* ZSTD_compressBegin_usingCDict_advanced() :