From: inikep <inikep@gmail.com>
Date: Wed, 10 Aug 2016 07:31:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev08
X-Git-Tag: v0.8.1^2~22^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6aed96f61f88851b6cc6e43d51af7ab4f8fba5a;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev08

# Conflicts:
#	zstd_compression_format.md
---

f6aed96f61f88851b6cc6e43d51af7ab4f8fba5a
diff --cc programs/bench.c
index c0bfd0dac,2364348d6..c85ab2ed0
--- a/programs/bench.c
+++ b/programs/bench.c
@@@ -132,9 -148,10 +140,10 @@@ typedef struc
  static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                          const char* displayName, int cLevel,
                          const size_t* fileSizes, U32 nbFiles,
 -                        const void* dictBuffer, size_t dictBufferSize, benchResult_t *result)
 +                        const void* dictBuffer, size_t dictBufferSize)
  {
      size_t const blockSize = (g_blockSize>=32 ? g_blockSize : srcSize) + (!srcSize) /* avoid div by 0 */ ;
+     size_t const avgSize = MIN(g_blockSize, (srcSize / nbFiles));
      U32 const maxNbBlocks = (U32) ((srcSize + (blockSize-1)) / blockSize) + nbFiles;
      blockParam_t* const blockTable = (blockParam_t*) malloc(maxNbBlocks * sizeof(blockParam_t));
      size_t const maxCompressedSize = ZSTD_compressBound(srcSize) + (maxNbBlocks * 1024);   /* add some room for safety */