diff options
| author | Eugene Sandulenko | 2010-08-31 21:07:36 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 23:22:46 +0000 |
| commit | 579d872e96862882d4cf92e82a0e8deb82496020 (patch) | |
| tree | 790b3fd7ebbff4e757790a899636f6f47ecc8ce0 /engines/sword25/fmv/theora_decoder.cpp | |
| parent | f06db87a0ee0323ceb5a1e946fa9ed1f8576abca (diff) | |
| download | scummvm-rg350-579d872e96862882d4cf92e82a0e8deb82496020.tar.gz scummvm-rg350-579d872e96862882d4cf92e82a0e8deb82496020.tar.bz2 scummvm-rg350-579d872e96862882d4cf92e82a0e8deb82496020.zip | |
SWORD25: Bugfixes for video playback.
svn-id: r53299
Diffstat (limited to 'engines/sword25/fmv/theora_decoder.cpp')
| -rw-r--r-- | engines/sword25/fmv/theora_decoder.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index bcd77ca880..bc95e10678 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -53,10 +53,6 @@ TheoraDecoder::TheoraDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundT _fileStream = 0; _surface = 0; - _theoraPacket = 0; - _vorbisPacket = 0; - _stateFlag = false; - _soundType = soundType; _audStream = 0; _audHandle = new Audio::SoundHandle(); @@ -299,7 +295,6 @@ void TheoraDecoder::close() { if (_mixer) _mixer->stopHandle(*_audHandle); _audStream = 0; - _vorbisPacket = 0; } if (_theoraPacket) { ogg_stream_clear(&_theoraOut); @@ -307,7 +302,6 @@ void TheoraDecoder::close() { th_comment_clear(&_theoraComment); th_info_clear(&_theoraInfo); _theoraDecode = 0; - _theoraPacket = 0; } if (!_fileStream) @@ -463,6 +457,10 @@ void TheoraDecoder::reset() { _audiobufGranulePos = 0; _curFrame = 0; + + _theoraPacket = 0; + _vorbisPacket = 0; + _stateFlag = false; } bool TheoraDecoder::endOfVideo() const { |