diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
| commit | 8ada6ed3cf562d33cc66f2a5d664b5e1f40e1f0c (patch) | |
| tree | a6430d873ca02f5cee683c95a3a4747c16f8aace /indra/llaudio | |
| parent | 657f75b89de4cfd5ade82e3bc30e236cd2533017 (diff) | |
| parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
Pull update from viewer-development
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index c82f194ff4..01dfd03c18 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -218,7 +218,7 @@ BOOL LLVorbisDecodeState::initDecode() S32 sample_count = ov_pcm_total(&mVF, -1); size_t size_guess = (size_t)sample_count; vorbis_info* vi = ov_info(&mVF, -1); - size_guess *= vi->channels; + size_guess *= (vi? vi->channels : 1); size_guess *= 2; size_guess += 2048; |