diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-07 14:23:09 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-03-07 14:23:09 -0800 |
| commit | 12c2fd2ef051ca922f0d3076bc8160820980b6e2 (patch) | |
| tree | 4d4d17a7481d5367595052c0bbe957549b7f4cce | |
| parent | 33927b8451bde10feeda0fc3d3c478b79ef2e0e2 (diff) | |
update ogg-vorbis archive usage for darwin.
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml index 37388a8fa4..0736a6afca 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1196,9 +1196,9 @@ <key>archive</key> <map> <key>hash</key> - <string>510c88fb183556b8c5fba25eb0c3d85e</string> + <string>57f32a1a670f06a4dc036eb1164ad9d7</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20101004.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/221801/arch/Darwin/installer/ogg_vorbis-1.1.3-1.2.0-darwin-20110222.tar.bz2</string> </map> <key>name</key> <string>darwin</string> diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 01dfd03c18..84105ddfca 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -680,4 +680,10 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid) return FALSE; } - +#ifdef LL_DARWIN +// HACK: to fool the compiler into not emitting unused warnings. +namespace { + const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY, + OV_CALLBACKS_STREAMONLY_NOCLOSE}; +} +#endif |