Merge pull request #725 from facebook/advancedAPI2

New Advanced API

diff --cc lib/compress/zstd_compress.c
Simple merge

diff --cc lib/decompress/zstd_decompress.c
Simple merge

diff --cc lib/zstd.h
Simple merge

diff --cc programs/fileio.c
index 0bcd1f87f120888f079fda5b59eab04d8b895294,d5340cc437781518cbc18e0e6889992a11ecdaca..78ac3ba6af816b1c19e60858c7fb51e1eae197ed
--- 1/programs/fileio.c
--- 2/programs/fileio.c
+++ b/programs/fileio.c
@@@ -91,9 -88,8 +88,9 @@@
  *  Macros
  ***************************************/
  #define DISPLAY(...)         fprintf(stderr, __VA_ARGS__)
 +#define DISPLAYOUT(...)      fprintf(stdout, __VA_ARGS__)
  #define DISPLAYLEVEL(l, ...) { if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); } }
- static int g_displayLevel = 2;   /* 0 : no display;   1: errors;   2 : + result + interaction + warnings;   3 : + progression;   4 : + information */
+ static int g_displayLevel = 2;   /* 0 : no display;  1: errors;  2: + result + interaction + warnings;  3: + progression;  4: + information */
  void FIO_setNotificationLevel(unsigned level) { g_displayLevel=level; }
  
  #define DISPLAYUPDATE(l, ...) { if (g_displayLevel>=l) { \

diff --cc programs/zstd.1.md
Simple merge

diff --cc programs/zstdcli.c
Simple merge