From cf54fc98d5bf47469284e2d6f9bc3d5807445adb Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 18 Sep 2011 09:38:30 +0200
Subject: VIDEO: Fix Bink bundle count lenghts to be computed like ffmpeg does.

Fixes several movies in Myst 3.---
 video/bink_decoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'video')

diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index c02042f972..a08c93522b 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;
 	}
 }
 
-- 
cgit v1.2.3