diff options
| author | lukaslw | 2014-06-22 19:59:00 +0200 |
|---|---|---|
| committer | lukaslw | 2014-06-22 20:00:45 +0200 |
| commit | 5a8b68676b8f6b31123e88ebdfbef1be4e57a717 (patch) | |
| tree | 02ea77ebb3e058a29e9c274fd8d5efd94bb6bab3 /video | |
| parent | 770a45390d4422dc9cbcb213808861297ba8e620 (diff) | |
| parent | c340570138e84277d39c64aaa7fdaf6d8be2cefb (diff) | |
| download | scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.gz scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.bz2 scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.zip | |
Merge branch 'master' into prince-lukaslw
Diffstat (limited to 'video')
| -rw-r--r-- | video/flic_decoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp index 5d27aa0a59..994f47cea8 100644 --- a/video/flic_decoder.cpp +++ b/video/flic_decoder.cpp @@ -176,7 +176,7 @@ const Graphics::Surface *FlicDecoder::FlicVideoTrack::decodeNextFrame() { uint16 newWidth = _fileStream->readUint16LE(); uint16 newHeight = _fileStream->readUint16LE(); - if ((newWidth != 0) && (newHeight != 0)) { + if ((newWidth != 0) || (newHeight != 0)) { if (newWidth == 0) newWidth = _surface->w; if (newHeight == 0) |