Merge branch 'dev' into progressiveMT

fixed minor conflict on cdict

diff --cc lib/compress/zstd_compress.c
index 5cc02bcc3f1e018b48c32cda16d94ab599871489,4ad5a6e617fd003bab93332c3e9d411f3dfdf1b3..bbe9146bd2e4ed0322f3fc3e1f43a01a22af360c
--- 1/lib/compress/zstd_compress.c
--- 2/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() :