Merge branch 'dev' into fuzz-max-block-size

diff --cc lib/compress/zstd_compress.c
index b9b056cd5f006593c8c9b1ccc1d0a37546a31649,b12cacc772769d7cf66ba29a00e3e61d053e2f9d..e13a8077913fa01f6510f850bd6b6b5ee3a793cc
--- 1/lib/compress/zstd_compress.c
--- 2/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -675,7 -670,6 +675,7 @@@ static int ZSTD_isUpdateAuthorized(ZSTD
      case ZSTD_c_deterministicRefPrefix:
      case ZSTD_c_prefetchCDictTables:
      case ZSTD_c_enableMatchFinderFallback:
-     case ZSTD_c_maxBlockSize:
++    case ZSTD_c_maxBlockSize
      default:
          return 0;
      }
@@@ -971,11 -964,6 +971,11 @@@ size_t ZSTD_CCtxParams_setParameter(ZST
          CCtxParams->enableMatchFinderFallback = value;
          return CCtxParams->enableMatchFinderFallback;
  
- 
 +    case ZSTD_c_maxBlockSize:
 +        BOUNDCHECK(ZSTD_c_maxBlockSize, value);
 +        CCtxParams->maxBlockSize = value;
 +        return CCtxParams->prefetchCDictTables;
++    
      default: RETURN_ERROR(parameter_unsupported, "unknown parameter");
      }
  }

diff --cc lib/zstd.h
index c2dfda7bbf8a9e2e878ad79b1df1f64e0e055ff4,480d65f675e9482ae86a8a91d6c96fefbf855f46..b46700b54305ec889ae11a7dd6b7f9e341200eb6
--- 1/lib/zstd.h
--- 2/lib/zstd.h
+++ b/lib/zstd.h
@@@ -500,9 -499,7 +500,8 @@@ typedef enum 
       ZSTD_c_experimentalParam14=1011,
       ZSTD_c_experimentalParam15=1012,
       ZSTD_c_experimentalParam16=1013,
 -     ZSTD_c_experimentalParam17=1014
 +     ZSTD_c_experimentalParam17=1014,
 +     ZSTD_c_experimentalParam18=1015,
- 
  } ZSTD_cParameter;
  
  typedef struct {