From 2ad7625831897d97524891cb88af8b3e48e4facb Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Wed, 5 Feb 2014 17:18:18 +0100 Subject: WINTERMUTE: Change the copyFrom-simplifications to depend on pitch instead of width. (Fix bug #6157) --- engines/wintermute/video/video_theora_player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/wintermute/video/video_theora_player.cpp') diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp index 299b64f915..3bce8628b8 100644 --- a/engines/wintermute/video/video_theora_player.cpp +++ b/engines/wintermute/video/video_theora_player.cpp @@ -305,7 +305,7 @@ bool VideoTheoraPlayer::update() { if (!_theoraDecoder->endOfVideo() && _theoraDecoder->getTimeToNextFrame() == 0) { const Graphics::Surface *decodedFrame = _theoraDecoder->decodeNextFrame(); if (decodedFrame) { - if (decodedFrame->format == _surface.format && decodedFrame->w == _surface.w && decodedFrame->h == _surface.h) { + if (decodedFrame->format == _surface.format && decodedFrame->pitch == _surface.pitch && decodedFrame->h == _surface.h) { const byte *src = (const byte *)decodedFrame->getBasePtr(0, 0); byte *dst = (byte *)_surface.getBasePtr(0, 0); memcpy(dst, src, _surface.pitch * _surface.h); -- cgit v1.2.3