diff options
| author | Fedor Strizhnev | 2015-01-05 16:53:35 +0300 |
|---|---|---|
| committer | Fedor Strizhnev | 2015-01-05 16:53:35 +0300 |
| commit | 7225101e6257d0574fb94be8a6016a3b67a09855 (patch) | |
| tree | e8df3a9fac8ce3dda256a7b029941cf1b75b23d6 /video | |
| parent | e27f5f69882345e45d6b2f1c8b449ea622d7d464 (diff) | |
| download | scummvm-rg350-7225101e6257d0574fb94be8a6016a3b67a09855.tar.gz scummvm-rg350-7225101e6257d0574fb94be8a6016a3b67a09855.tar.bz2 scummvm-rg350-7225101e6257d0574fb94be8a6016a3b67a09855.zip | |
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; |