diff options
| author | Cameron Cawley | 2018-08-16 17:28:24 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-18 13:33:43 +0200 |
| commit | 06446d36f50d2cca3a0c4861db0d050f25e36708 (patch) | |
| tree | 263bba06af765bdb6a98d30f5b995f09d9e049f6 | |
| parent | f0fe48d2f7d75deebf6b609f64c14b38b94a9afc (diff) | |
| download | scummvm-rg350-06446d36f50d2cca3a0c4861db0d050f25e36708.tar.gz scummvm-rg350-06446d36f50d2cca3a0c4861db0d050f25e36708.tar.bz2 scummvm-rg350-06446d36f50d2cca3a0c4861db0d050f25e36708.zip | |
VIDEO: More fixes when building with Theora and Tremor
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | video/theora_decoder.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -4285,7 +4285,6 @@ if test "$_theoradec" = auto ; then _theoradec=no cat > $TMPC << EOF #include <theora/theoradec.h> -#include <vorbis/codec.h> int main(void) { th_ycbcr_buffer yuv; th_decode_ycbcr_out(NULL, yuv); } EOF cc_check $THEORADEC_CFLAGS $THEORADEC_LIBS -ltheoradec && _theoradec=yes diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp index f00bd485f9..1fef6d5be8 100644 --- a/video/theora_decoder.cpp +++ b/video/theora_decoder.cpp @@ -386,7 +386,7 @@ bool TheoraDecoder::VorbisAudioTrack::decodeSamples() { for (i = 0; i < ret && i < maxsamples; i++) { for (int j = 0; j < channels; j++) { #ifdef USE_TREMOR - int val = CLIP(pcm[j][i] >> 9, -32768, 32767); + int val = CLIP((int)pcm[j][i] >> 9, -32768, 32767); #else int val = CLIP((int)rint(pcm[j][i] * 32767.f), -32768, 32767); #endif |