From f8323cc67230b64de5af93624f57aba4020fecdf Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 17 May 2011 23:56:15 -0400 Subject: SWORD25: Make Theora handle the case when the packet eos is not set --- engines/sword25/fmv/theora_decoder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sword25') 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; } -- cgit v1.2.3