diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /video/bink_decoder.cpp | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'video/bink_decoder.cpp')
| -rw-r--r-- | video/bink_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp index c60dbc29be..c02042f972 100644 --- a/video/bink_decoder.cpp +++ b/video/bink_decoder.cpp @@ -1538,13 +1538,13 @@ static inline int floatToInt16One(float src) { void BinkDecoder::floatToInt16Interleave(int16 *dst, const float **src, uint32 length, uint8 channels) { if (channels == 2) { for (uint32 i = 0; i < length; i++) { - dst[2 * i ] = TO_LE_16(floatToInt16One(src[0][i])); - dst[2 * i + 1] = TO_LE_16(floatToInt16One(src[1][i])); + dst[2 * i ] = floatToInt16One(src[0][i]); + dst[2 * i + 1] = floatToInt16One(src[1][i]); } } else { for(uint8 c = 0; c < channels; c++) for(uint32 i = 0, j = c; i < length; i++, j += channels) - dst[j] = TO_LE_16(floatToInt16One(src[c][i])); + dst[j] = floatToInt16One(src[c][i]); } } |