diff options
| author | Matthew Hoops | 2011-05-17 23:56:15 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-18 10:05:13 -0400 |
| commit | f8323cc67230b64de5af93624f57aba4020fecdf (patch) | |
| tree | 7c645fec0132700340d4f9156f2b00d259d81560 /engines/sword25 | |
| parent | 0addffbfd3952f766e7f839c210465c9c34b94bd (diff) | |
| download | scummvm-rg350-f8323cc67230b64de5af93624f57aba4020fecdf.tar.gz scummvm-rg350-f8323cc67230b64de5af93624f57aba4020fecdf.tar.bz2 scummvm-rg350-f8323cc67230b64de5af93624f57aba4020fecdf.zip | |
SWORD25: Make Theora handle the case when the packet eos is not set
Diffstat (limited to 'engines/sword25')
| -rw-r--r-- | engines/sword25/fmv/theora_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index 9aa7ead385..7957cb0274 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -383,7 +383,7 @@ const Graphics::Surface *TheoraDecoder::decodeNextFrame() { } } else { // If we can't get any more frames, we're done. - if (_theoraOut.e_o_s) { + if (_theoraOut.e_o_s || _fileStream->eos()) { _endOfVideo = true; break; } @@ -406,7 +406,7 @@ const Graphics::Surface *TheoraDecoder::decodeNextFrame() { queuePage(&_oggPage); bool queuedAudio = queueAudio(); - if (_vorbisOut.e_o_s && !queuedAudio) { + if ((_vorbisOut.e_o_s || _fileStream->eos()) && !queuedAudio) { _endOfAudio = true; break; } |