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

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Tue Jul 14 18:45:20 CEST 2009


Revision: 42484
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42484&view=rev
Author:   eriktorbjorn
Date:     2009-07-14 16:45:18 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Got rid of ioFailed(). I haven't actually tested it, but we don't use the MPEG
decoder at the moment, and it was only used in the BACKEND_8BIT case anyway.

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

Modified: scummvm/trunk/graphics/video/mpeg_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/mpeg_player.cpp	2009-07-14 15:48:05 UTC (rev 42483)
+++ scummvm/trunk/graphics/video/mpeg_player.cpp	2009-07-14 16:45:18 UTC (rev 42484)
@@ -86,13 +86,10 @@
 	}
 
 	p = 0;
-	while (1) {
+	while (!f.eos()) {
 		_palettes[p].end = f.readUint16LE();
 		_palettes[p].cnt = f.readUint16LE();
 
-		if (f.ioFailed())
-			break;
-
 		for (i = 0; i < _palettes[p].cnt; i++) {
 			_palettes[p].pal[4 * i] = f.readByte();
 			_palettes[p].pal[4 * i + 1] = f.readByte();


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