From 9c349cf78b21ef147ab739003d5f89d6d537c1c9 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Mon, 8 Nov 2010 17:03:27 +0000
Subject: VIDEO: PreIMD: End frame when stream depleted

As happens for the last frames in the Fascination videos.

svn-id: r54144
---
 graphics/video/coktel_decoder.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'graphics/video')

diff --git a/graphics/video/coktel_decoder.cpp b/graphics/video/coktel_decoder.cpp
index 6ebc64592e..15ba049536 100644
--- a/graphics/video/coktel_decoder.cpp
+++ b/graphics/video/coktel_decoder.cpp
@@ -684,11 +684,11 @@ Surface *PreIMDDecoder::decodeNextFrame() {
 }
 
 void PreIMDDecoder::processFrame() {
+	_curFrame++;
+
 	uint16 frameSize = _stream->readUint16LE();
-	if (frameSize == 0) {
-		_curFrame++;
+	if (_stream->eos() || (frameSize == 0))
 		return;
-	}
 
 	uint32 nextFramePos = _stream->pos() + frameSize + 2;
 
@@ -752,8 +752,6 @@ void PreIMDDecoder::processFrame() {
 	}
 
 	_stream->seek(nextFramePos);
-
-	_curFrame++;
 }
 
 // Just a simple blit
-- 
cgit v1.2.3