[Scummvm-git-logs] scummvm master -> 4e515ea3fed53f8390fa3a0776aee170e4be1b95

[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:
4e515ea3fe TITANIC: Properly handle videos with some frames being paletted 8-bit


Commit: 4e515ea3fed53f8390fa3a0776aee170e4be1b95
    https://github.com/scummvm/scummvm/commit/4e515ea3fed53f8390fa3a0776aee170e4be1b95
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-14T22:51:10-05:00

Commit Message:
TITANIC: Properly handle videos with some frames being paletted 8-bit

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 3619823..11569e8 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -314,8 +314,14 @@ bool AVISurface::renderFrame() {
 		const Graphics::Surface *frame = (idx == 0) ?
 			_decoder->decodeNextFrame() : _decoder->decodeNextTransparency();
 
-		assert(_movieFrameSurface[idx]->format == frame->format);
-		_movieFrameSurface[idx]->blitFrom(*frame);
+		if (_movieFrameSurface[idx]->format == frame->format) {
+			_movieFrameSurface[idx]->blitFrom(*frame);
+		} else {
+			Graphics::Surface *s = frame->convertTo(_movieFrameSurface[idx]->format,
+				_decoder->getPalette());
+			_movieFrameSurface[idx]->blitFrom(*s);
+			delete s;
+		}
 	}
 
 	if (!_framePixels) {