[Scummvm-git-logs] scummvm master -> 4740f16b7f2b964d9c7cde2e0856f408c912ecdd

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4740f16b7f TITANIC: Fix playing cutscenes to the very of a video


Commit: 4740f16b7f2b964d9c7cde2e0856f408c912ecdd
    https://github.com/scummvm/scummvm/commit/4740f16b7f2b964d9c7cde2e0856f408c912ecdd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-28T22:59:17-04:00

Commit Message:
TITANIC: Fix playing cutscenes to the very of a video

Changed paths:
    engines/titanic/support/avi_surface.cpp



diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 8d89ef7..c88c89c 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -371,7 +371,7 @@ void AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) {
 		_movieFrameSurface[0]->h != r.height();
 
 	startAtFrame(startFrame);
-	while (_currentFrame < (int)endFrame && !g_vm->shouldQuit()) {
+	while (!_decoder->endOfVideo() && _currentFrame < (int)endFrame && !g_vm->shouldQuit()) {
 		if (isNextFrame()) {
 			renderFrame();
 			_currentFrame = _decoder->getCurFrame();