TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #612 from GarageGames/platform-type-consistency

Browse source 
Platform type consistency
This commit is contained in:
Daniel Buckmaster 2014-05-10 11:40:40 +10:00
commit 1702573b78
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/gfx/video/videoEncoderTheora.cpp
View file

@ -150,8 +150,8 @@ class VideoEncoderTheora : public VideoEncoder, public Thread
F64 videotime = th_granule_time(td,ogg_page_granulepos(&videopage));
if (videotime > 0)
{
int hundredths=(int)(videotime*100-(long)videotime*100);
int seconds=(long)videotime%60;
S32 hundredths=(int)(videotime*100-(long)videotime*100);
S32 seconds=(long)videotime%60;
Platform::outputDebugString("Encoding time %g %02i.%02i", videotime, seconds, hundredths);
}
}
@ -254,12 +254,12 @@ public:
th_info_clear(&ti);
// This is needed for youtube compatibility
int vp3_compatible = 1;
S32 vp3_compatible = 1;
th_encode_ctl(td, TH_ENCCTL_SET_VP3_COMPATIBLE, &vp3_compatible, sizeof(vp3_compatible));
// Set the encoder to max speed
int speed_max;
int ret;
S32 speed_max;
S32 ret;
ret = th_encode_ctl(td, TH_ENCCTL_GET_SPLEVEL_MAX, &speed_max, sizeof(speed_max));
if(ret<0){
Platform::outputDebugString("VideoEncoderTheora::begin() - could not determine maximum speed level.");