diff options
| -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 |