[Scummvm-cvs-logs] SF.net SVN: scummvm:[54073] scummvm/branches/branch-1-2-0/graphics/video/ coktel_decoder.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Thu Nov 4 21:37:04 CET 2010
Revision: 54073
http://scummvm.svn.sourceforge.net/scummvm/?rev=54073&view=rev
Author: drmccoy
Date: 2010-11-04 20:37:03 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
VIDEO: Backport: PreIMD: End frame when frameSize == 0
As happens for the last frame in the first video of the Fascination
intro.
Modified Paths:
--------------
scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp
Modified: scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp 2010-11-04 20:36:28 UTC (rev 54072)
+++ scummvm/branches/branch-1-2-0/graphics/video/coktel_decoder.cpp 2010-11-04 20:37:03 UTC (rev 54073)
@@ -685,6 +685,10 @@
void PreIMDDecoder::processFrame() {
uint16 frameSize = _stream->readUint16LE();
+ if (frameSize == 0) {
+ _curFrame++;
+ return;
+ }
uint32 nextFramePos = _stream->pos() + frameSize + 2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list