diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
| commit | 81ea8d1751a8866b9ec998542c7d6e9b5645f357 (patch) | |
| tree | 1f7f45a9bcf469efe9fc30c68aee2638342c1557 /indra/llaudio | |
| parent | f2d61c7371171e0ee1329186116c585aa5de7f52 (diff) | |
| parent | 72e597a6f9e6dacbb41383ee8ee29e55acff4b74 (diff) | |
Pull from lindenlab/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; |