[Scummvm-git-logs] scummvm master -> 06446d36f50d2cca3a0c4861db0d050f25e36708

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
06446d36f5 VIDEO: More fixes when building with Theora and Tremor


Commit: 06446d36f50d2cca3a0c4861db0d050f25e36708
    https://github.com/scummvm/scummvm/commit/06446d36f50d2cca3a0c4861db0d050f25e36708
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-18T13:33:43+02:00

Commit Message:
VIDEO: More fixes when building with Theora and Tremor

Changed paths:
    configure
    video/theora_decoder.cpp


diff --git a/configure b/configure
index dfad09d..92f80e7 100755
--- a/configure
+++ b/configure
@@ -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 f00bd48..1fef6d5 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