aboutsummaryrefslogtreecommitdiff
path: root/audio/decoders
diff options
context:
space:
mode:
authorKamil Zbróg2014-01-27 21:43:05 +0100
committerKamil Zbróg2014-01-27 21:43:05 +0100
commit8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (patch)
tree5d02a8fba0559c16f2a2045b14e3e292509c6924 /audio/decoders
parent444934a0accec982f55db92c17ef65270fe18e66 (diff)
parent0f5eeaed7b3c9d2f74eee7dff2114c5f4dc63f00 (diff)
downloadscummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.gz
scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.bz2
scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.zip
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'audio/decoders')
-rw-r--r--audio/decoders/voc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/decoders/voc.cpp b/audio/decoders/voc.cpp
index fa330c6f2c..ec589533eb 100644
--- a/audio/decoders/voc.cpp
+++ b/audio/decoders/voc.cpp
@@ -559,7 +559,7 @@ SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, byte flag
SeekableAudioStream *audioStream = new VocStream(stream, (flags & Audio::FLAG_UNSIGNED) != 0, disposeAfterUse);
- if (audioStream && audioStream->endOfData()) {
+ if (audioStream->endOfData()) {
delete audioStream;
return 0;
} else {