aboutsummaryrefslogtreecommitdiff
path: root/video
diff options
context:
space:
mode:
authorRichieSams2013-09-04 00:35:34 -0500
committerRichieSams2013-09-04 00:35:34 -0500
commit1697a9c83114b181074f43d9f872f6e5c43c0a5f (patch)
tree56805a99c5a26be2d8dc3773fd258cc9641544c1 /video
parent150a4793a670fb06b7997d7964f9626f3a238766 (diff)
parent9b027771557bf308d8aa92ea9c25b30be15b68d6 (diff)
downloadscummvm-rg350-1697a9c83114b181074f43d9f872f6e5c43c0a5f.tar.gz
scummvm-rg350-1697a9c83114b181074f43d9f872f6e5c43c0a5f.tar.bz2
scummvm-rg350-1697a9c83114b181074f43d9f872f6e5c43c0a5f.zip
Merge branch 'master' into zvision
Diffstat (limited to 'video')
-rw-r--r--video/codecs/truemotion1.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp
index e475c8426c..720e86a4ff 100644
--- a/video/codecs/truemotion1.cpp
+++ b/video/codecs/truemotion1.cpp
@@ -400,11 +400,14 @@ void TrueMotion1Decoder::decode16() {
const Graphics::Surface *TrueMotion1Decoder::decodeImage(Common::SeekableReadStream *stream) {
decodeHeader(stream);
- if (compressionTypes[_header.compression].algorithm == ALGO_NOP)
+ if (compressionTypes[_header.compression].algorithm == ALGO_NOP) {
+ delete[] _buf;
return 0;
+ }
if (compressionTypes[_header.compression].algorithm == ALGO_RGB24H) {
warning("Unhandled TrueMotion1 24bpp frame");
+ delete[] _buf;
return 0;
} else
decode16();