diff options
| author | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
| commit | d6d1cb852d014dd002656ed35537975ebb6300b0 (patch) | |
| tree | 0e432c855eb3105e2c1e2bd67a3010b6c73f7b50 /indra/llaudio | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | 71db6d1b91cb8a62959a63ae36d3727e48439245 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 2 | ||||
| -rw-r--r-- | indra/llaudio/llaudioengine.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index f0b44f97d2..7f747c2eca 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -215,7 +215,7 @@ BOOL LLVorbisDecodeState::initDecode() return(FALSE); } - S32 sample_count = ov_pcm_total(&mVF, -1); + S32 sample_count = (S32)ov_pcm_total(&mVF, -1); size_t size_guess = (size_t)sample_count; vorbis_info* vi = ov_info(&mVF, -1); size_guess *= (vi? vi->channels : 1); diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index a47ee7ca7c..28b69e1973 100644 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -37,6 +37,7 @@ #include "lluuid.h" #include "llframetimer.h" #include "llassettype.h" +#include "llextendedstatus.h" #include "lllistener.h" |