Blame SOURCES/libsndfile-1.0.31-deb669ee.patch
|
 |
712c14 |
diff --git a/src/ms_adpcm.c b/src/ms_adpcm.c
|
|
|
712c14 |
index 5e8f1a31..a21cb994 100644
|
|
|
712c14 |
--- a/src/ms_adpcm.c
|
|
|
712c14 |
+++ b/src/ms_adpcm.c
|
|
|
712c14 |
@@ -128,8 +128,14 @@ wavlike_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
|
|
|
712c14 |
if (psf->file.mode == SFM_WRITE)
|
|
|
712c14 |
samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ;
|
|
|
712c14 |
|
|
|
712c14 |
- if (blockalign < 7 * psf->sf.channels)
|
|
|
712c14 |
- { psf_log_printf (psf, "*** Error blockalign (%d) should be > %d.\n", blockalign, 7 * psf->sf.channels) ;
|
|
|
712c14 |
+ /* There's 7 samples per channel in the preamble of each block */
|
|
|
712c14 |
+ if (samplesperblock < 7 * psf->sf.channels)
|
|
|
712c14 |
+ { psf_log_printf (psf, "*** Error samplesperblock (%d) should be >= %d.\n", samplesperblock, 7 * psf->sf.channels) ;
|
|
|
712c14 |
+ return SFE_INTERNAL ;
|
|
|
712c14 |
+ } ;
|
|
|
712c14 |
+
|
|
|
712c14 |
+ if (2 * blockalign < samplesperblock * psf->sf.channels)
|
|
|
712c14 |
+ { psf_log_printf (psf, "*** Error blockalign (%d) should be >= %d.\n", blockalign, samplesperblock * psf->sf.channels / 2) ;
|
|
|
712c14 |
return SFE_INTERNAL ;
|
|
|
712c14 |
} ;
|
|
|
712c14 |
|