[Scummvm-cvs-logs] SF.net SVN: scummvm:[46163] scummvm/trunk/graphics/video/avi_decoder.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Fri Nov 27 20:26:20 CET 2009


Revision: 46163
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46163&view=rev
Author:   drmccoy
Date:     2009-11-27 19:26:20 +0000 (Fri, 27 Nov 2009)

Log Message:
-----------
00AM is another compressed frame type, fixing this (thanks to digitall for figuring that out :D)

Modified Paths:
--------------
    scummvm/trunk/graphics/video/avi_decoder.cpp

Modified: scummvm/trunk/graphics/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.cpp	2009-11-27 18:25:40 UTC (rev 46162)
+++ scummvm/trunk/graphics/video/avi_decoder.cpp	2009-11-27 19:26:20 UTC (rev 46163)
@@ -313,7 +313,7 @@
 		_fileStream->read(data, chunkSize);
 		_audStream->queueBuffer(data, chunkSize);
 		_fileStream->skip(chunkSize & 1); // Alignment
-	} else if (getStreamType(nextTag) == 'dc' || getStreamType(nextTag) == 'id') {		
+	} else if (getStreamType(nextTag) == 'dc' || getStreamType(nextTag) == 'id' || getStreamType(nextTag) == 'AM') {		
 		// Compressed Frame
 		_videoInfo.currentFrame++;
 		uint32 chunkSize = _fileStream->readUint32LE();
@@ -349,8 +349,6 @@
 		// No alignment necessary. It's always even.
 	} else if (nextTag == ID_JUNK) {
 		runHandle(ID_JUNK);
-	} else if (nextTag == ID_00AM) {
-		runHandle(ID_JUNK);
 	} else if (nextTag == ID_IDX1) {
 		runHandle(ID_IDX1);
 	} else


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