[Scummvm-cvs-logs] SF.net SVN: scummvm:[55349] scummvm/trunk/engines/gob/videoplayer.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Thu Jan 20 13:28:46 CET 2011
Revision: 55349
http://scummvm.svn.sourceforge.net/scummvm/?rev=55349&view=rev
Author: drmccoy
Date: 2011-01-20 12:28:46 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
GOB: Don't not play videos with only sound
Modified Paths:
--------------
scummvm/trunk/engines/gob/videoplayer.cpp
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2011-01-20 12:28:22 UTC (rev 55348)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2011-01-20 12:28:46 UTC (rev 55349)
@@ -114,7 +114,8 @@
if (!(video->decoder = openVideo(file, properties)))
return -1;
- if (video->decoder->isPaletted() != !_vm->isTrueColor()) {
+ if (video->decoder->hasVideo() && !(properties.flags & kFlagNoVideo) &&
+ (video->decoder->isPaletted() != !_vm->isTrueColor())) {
if (!properties.switchColorMode)
return -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list