diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
| commit | 56af97063aaa35c1a70f5edaf47f4a015600860d (patch) | |
| tree | 299b113fab1ff7176c86342aa3e881491cd3b883 /indra/llaudio | |
| parent | b679975d8fdc22d33d0f62288934be8f0209157e (diff) | |
| parent | 681c5de92bd09622de360818682240b0a17403f7 (diff) | |
Pull from vir/drano
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" |