diff options
| author | Einar Johan Trøan Sømåen | 2014-02-05 17:18:18 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2014-02-05 17:18:46 +0100 |
| commit | 2ad7625831897d97524891cb88af8b3e48e4facb (patch) | |
| tree | 5c3a69f6a283c70d87efd6ea2e9bd4803eb62649 /engines/wintermute/video | |
| parent | cfb0492cbbd4f86d260426a9db2d14f7c365da6b (diff) | |
| download | scummvm-rg350-2ad7625831897d97524891cb88af8b3e48e4facb.tar.gz scummvm-rg350-2ad7625831897d97524891cb88af8b3e48e4facb.tar.bz2 scummvm-rg350-2ad7625831897d97524891cb88af8b3e48e4facb.zip | |
WINTERMUTE: Change the copyFrom-simplifications to depend on pitch instead of width. (Fix bug #6157)
Diffstat (limited to 'engines/wintermute/video')
| -rw-r--r-- | engines/wintermute/video/video_theora_player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |