[Scummvm-cvs-logs] scummvm master -> cf54fc98d5bf47469284e2d6f9bc3d5807445adb

bgK bastien.bouclet at gmail.com
Sun Sep 18 09:43:57 CEST 2011


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:
cf54fc98d5 VIDEO: Fix Bink bundle count lenghts to be computed like ffmpeg does.


Commit: cf54fc98d5bf47469284e2d6f9bc3d5807445adb
    https://github.com/scummvm/scummvm/commit/cf54fc98d5bf47469284e2d6f9bc3d5807445adb
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2011-09-18T00:38:30-07:00

Commit Message:
VIDEO: Fix Bink bundle count lenghts to be computed like ffmpeg does.
    
Fixes several movies in Myst 3.

Changed paths:
    video/bink_decoder.cpp



diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index c02042f9..a08c935 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -703,13 +703,13 @@ void BinkDecoder::initBundles() {
 
 		_bundles[kSourceBlockTypes   ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
 		_bundles[kSourceSubBlockTypes].countLengths[i] = Common::intLog2((width  >> 4)    + 511) + 1;
-		_bundles[kSourceColors       ].countLengths[i] = Common::intLog2((width  >> 3)*64 + 511) + 1;
+		_bundles[kSourceColors       ].countLengths[i] = Common::intLog2((cbw[i]     )*64 + 511) + 1;
 		_bundles[kSourceIntraDC      ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
 		_bundles[kSourceInterDC      ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
 		_bundles[kSourceXOff         ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
 		_bundles[kSourceYOff         ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
 		_bundles[kSourcePattern      ].countLengths[i] = Common::intLog2((cbw[i] << 3)    + 511) + 1;
-		_bundles[kSourceRun          ].countLengths[i] = Common::intLog2((width  >> 3)*48 + 511) + 1;
+		_bundles[kSourceRun          ].countLengths[i] = Common::intLog2((cbw[i]     )*48 + 511) + 1;
 	}
 }
 






More information about the Scummvm-git-logs mailing list