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

bluegr md5 at scummvm.org
Tue Jul 19 10:37:23 CEST 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2cdd83141a CREATE_PROJECT: Enabled the new Bink video support feature
e1ca235c44 BINK decoder: Fixed compilation with MSVC


Commit: 2cdd83141ab2cf364de62973de4c014944836f73
    https://github.com/scummvm/scummvm/commit/2cdd83141ab2cf364de62973de4c014944836f73
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-07-19T00:50:12-07:00

Commit Message:
CREATE_PROJECT: Enabled the new Bink video support feature

Changed paths:
    devtools/create_project/create_project.cpp



diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 35d0856..0b190b3 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -773,6 +773,7 @@ const Feature s_features[] = {
 	{  "theora",   "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" },
 
 	// Feature flags
+	{        "bink",        "USE_BINK",         "", true, "Bink video support" },
 	{     "scalers",     "USE_SCALERS",         "", true, "Scalers" },
 	{   "hqscalers",  "USE_HQ_SCALERS",         "", true, "HQ scalers" },
 	{       "16bit",   "USE_RGB_COLOR",         "", true, "16bit color support" },


Commit: e1ca235c4457e7f5f35dea688396845146fbf04a
    https://github.com/scummvm/scummvm/commit/e1ca235c4457e7f5f35dea688396845146fbf04a
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-07-19T00:50:48-07:00

Commit Message:
BINK decoder: Fixed compilation with MSVC

Changed paths:
    video/bink_decoder.cpp



diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index 1f3190d..cebda72 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -654,7 +654,7 @@ void BinkDecoder::initAudioTrack(AudioTrack &audio) {
 
 	audio.overlapLen = audio.frameLen / 16;
 	audio.blockSize  = (audio.frameLen - audio.overlapLen) * audio.channels;
-	audio.root       = 2.0 / sqrt(audio.frameLen);
+	audio.root       = 2.0 / sqrt((double)audio.frameLen);
 
 	uint32 sampleRateHalf = (audio.sampleRate + 1) / 2;
 






More information about the Scummvm-git-logs mailing list