[Scummvm-cvs-logs] scummvm master -> 02eada1d0ddd5f5c179ca39840bb7f73286df6e1

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
02eada1d0d ZVISION: Fix Zork AVI audio on BE systems


Commit: 02eada1d0ddd5f5c179ca39840bb7f73286df6e1
    https://github.com/scummvm/scummvm/commit/02eada1d0ddd5f5c179ca39840bb7f73286df6e1
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-12-27T23:13:08+01:00

Commit Message:
ZVISION: Fix Zork AVI audio on BE systems

Changed paths:
    engines/zvision/video/zork_avi_decoder.cpp



diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index 67fab0a..5618250 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -45,8 +45,14 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *s
 			RawChunkStream::RawChunk chunk = decoder->readNextChunk(stream);
 			delete stream;
 
-			if (chunk.data)
-				_audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_STEREO);
+			if (chunk.data) {
+				byte flags = Audio::FLAG_16BITS | Audio::FLAG_STEREO;
+#ifdef SCUMM_LITTLE_ENDIAN
+				// RawChunkStream produces native endianness int16
+				flags |= Audio::FLAG_LITTLE_ENDIAN;
+#endif
+				_audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, flags);
+			}
 		} else {
 			AVIAudioTrack::queueSound(stream);
 		}