Merge tag 'upstream/1.0.31' into tizen_base

Change-Id: Ic196890914948b5f3d11e80b2df0a1179925dfe6

diff --cc examples/generate.c
Simple merge

diff --cc src/aiff.c
Simple merge

diff --cc src/common.h
index 3e51828,08360d0..199ed8f
--- 1/src/common.h
--- 2/src/common.h
+++ b/src/common.h
@@@ -939,8 -940,12 +939,10 @@@ int              alaw_init               (SF_PRIVATE *psf) 
  int           float32_init    (SF_PRIVATE *psf) ;
  int           double64_init   (SF_PRIVATE *psf) ;
  int           dwvw_init               (SF_PRIVATE *psf, int bitwidth) ;
+ int           gsm610_init             (SF_PRIVATE *psf) ;
+ int           nms_adpcm_init  (SF_PRIVATE *psf) ;
  int           vox_adpcm_init  (SF_PRIVATE *psf) ;
  int           flac_init               (SF_PRIVATE *psf) ;
 -int           g72x_init               (SF_PRIVATE * psf) ;
 -int           alac_init               (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) ;
  
  int   dither_init             (SF_PRIVATE *psf, int mode) ;
  

diff --cc src/flac.c
Simple merge

diff --cc src/ogg_vorbis.c
Simple merge

diff --cc src/raw.c
index d640075,c8fcbfd..0c768e3
--- 1/src/raw.c
--- 2/src/raw.c
+++ b/src/raw.c
@@@ -67,7 -67,18 +67,14 @@@ raw_open    (SF_PRIVATE *psf
                                error = alaw_init (psf) ;
                                break ;
  
 -              case SF_FORMAT_GSM610 :
 -                              error = gsm610_init (psf) ;
 -                              break ;
 -
                /* Lite remove start */
+ 
+               case SF_FORMAT_NMS_ADPCM_16 :
+               case SF_FORMAT_NMS_ADPCM_24 :
+               case SF_FORMAT_NMS_ADPCM_32 :
+                               error = nms_adpcm_init (psf) ;
+                               break ;
+ 
                case SF_FORMAT_FLOAT :
                                error = float32_init (psf) ;
                                break ;

diff --cc src/sndfile.c
Simple merge

diff --cc src/w64.c
Simple merge

diff --cc src/wav.c
index c21d333,fd3e453..6d93935
--- 1/src/wav.c
--- 2/src/wav.c
+++ b/src/wav.c
@@@ -258,8 -258,22 +258,18 @@@ wav_open (SF_PRIVATE *psf
                                        error = wavlike_msadpcm_init (psf, blockalign, framesperblock) ;
                                        break ;
  
+               case SF_FORMAT_G721_32 :
+                                       error = g72x_init (psf) ;
+                                       break ;
+ 
+               case SF_FORMAT_NMS_ADPCM_16 :
+               case SF_FORMAT_NMS_ADPCM_24 :
+               case SF_FORMAT_NMS_ADPCM_32 :
+                                       error = nms_adpcm_init (psf) ;
+                                       break ;
+ 
                /* Lite remove end */
  
 -              case SF_FORMAT_GSM610 :
 -                                      error = gsm610_init (psf) ;
 -                                      break ;
 -
                default :       return SFE_UNIMPLEMENTED ;
                } ;