diff options
| author | Eugene Sandulenko | 2015-01-11 21:12:01 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-01-11 21:12:01 +0100 |
| commit | 8e0d7d72554a7f21e3c717871da3895c3d8ec118 (patch) | |
| tree | 5e175caa0c1eedf3d01ad5b676750d47c0215942 /video | |
| parent | dd7da7c3c352e28792b1feeab725821ebf4fcafc (diff) | |
| parent | dd5f5588d9fb29179dfd0f354728dc6cacf26897 (diff) | |
| download | scummvm-rg350-8e0d7d72554a7f21e3c717871da3895c3d8ec118.tar.gz scummvm-rg350-8e0d7d72554a7f21e3c717871da3895c3d8ec118.tar.bz2 scummvm-rg350-8e0d7d72554a7f21e3c717871da3895c3d8ec118.zip | |
Merge pull request #559 from fedor4ever/master
VIDEO: Add Theora support to systems which use libtremor
Diffstat (limited to 'video')
| -rw-r--r-- | video/theora_decoder.cpp | 4 | ||||
| -rw-r--r-- | video/theora_decoder.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp index cb6289bd60..ba596c6032 100644 --- a/video/theora_decoder.cpp +++ b/video/theora_decoder.cpp @@ -360,7 +360,11 @@ static double rint(double v) { } bool TheoraDecoder::VorbisAudioTrack::decodeSamples() { +#ifdef USE_TREMOR + ogg_int32_t **pcm; +#else float **pcm; +#endif // if there's pending, decoded audio, grab it int ret = vorbis_synthesis_pcmout(&_vorbisDSP, &pcm); diff --git a/video/theora_decoder.h b/video/theora_decoder.h index feb4c6b49e..5b683cf6af 100644 --- a/video/theora_decoder.h +++ b/video/theora_decoder.h @@ -33,7 +33,12 @@ #include "graphics/surface.h" #include <theora/theoradec.h> + +#ifdef USE_TREMOR +#include <tremor/ivorbiscodec.h> +#else #include <vorbis/codec.h> +#endif namespace Common { class SeekableReadStream; |