[Scummvm-cvs-logs] SF.net SVN: scummvm: [22833] tools/trunk

[kirben at users.sourceforge.net]

Revision: 22833
Author:   kirben
Date:     2006-06-02 05:57:09 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22833&view=rev

Log Message:
-----------
The Y-interlaced flag of Smacker format uses double height too. Fixes icetrench.smk and maybe others in 4CD version of FF

Modified Paths:
--------------
    tools/trunk/README
    tools/trunk/encode_dxa.cpp
Modified: tools/trunk/README
===================================================================
--- tools/trunk/README	2006-06-02 11:41:19 UTC (rev 22832)
+++ tools/trunk/README	2006-06-02 12:57:09 UTC (rev 22833)
@@ -121,11 +121,9 @@
                 'introXXX.png' where XXX is frame number. Make sure you
                 extracted 256 colors PNGs, otherwise encode_dxa will complain.
 
-                2. Extract audio to WAV format. You will get file 'intro.wav'.
+                2. Put files 'intro.smk', and 'intro*.png' to a single 
+                directory, say, video/
 
-                3. Put files 'intro.smk', 'intro.wav' and 'intro*.png' to a
-                single directory, say, video/
-
                 4. Run `encode_dxa intro /path/to/directory/video/`
                 or for simplicity cd to that directory and run
                 `encode_data intro ./`

Modified: tools/trunk/encode_dxa.cpp
===================================================================
--- tools/trunk/encode_dxa.cpp	2006-06-02 11:41:19 UTC (rev 22832)
+++ tools/trunk/encode_dxa.cpp	2006-06-02 12:57:09 UTC (rev 22833)
@@ -340,10 +340,10 @@
 	framerate = readUint32LE(smk);
 	flags = readUint32LE(smk);
 
-	// If the Y-doubled flag is set, the RAD Video Tools will have scaled
-	// the frames to twice their original height.
+	// If the Y-interlaced or Y-doubled flag is set, the RAD Video Tools
+	// will have scaled the frames to twice their original height.
 
-	if (flags & 0x04)
+	if ((flags & 0x02) || (flags & 0x04))
 		height *= 2;
 
 	fclose(smk);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.