thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIDEO: More fixes when building with Theora and Tremor

Browse source
This commit is contained in:
Cameron Cawley 2018-08-16 17:28:24 +01:00 • committed by Eugene Sandulenko
parent f0fe48d2f7
commit 06446d36f5
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure vendored
View file

@ -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

2
video/theora_decoder.cpp
View file

@ -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