diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-09-16 12:02:24 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-09-16 12:02:24 -0700 |
| commit | 60db8577a90be3ea3d4a06ab06232802be953286 (patch) | |
| tree | 0fcedbdf478b3f518a0d5dc69b7d234406355d75 /indra/llaudio/llaudiodecodemgr.cpp | |
| parent | ae623c8068145f968f09ccf9bbdd90e993ca4283 (diff) | |
| parent | 1dbcc3fff79b55038178e493df0cc0c3a4d66221 (diff) | |
Merge
Diffstat (limited to 'indra/llaudio/llaudiodecodemgr.cpp')
| -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; |