aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorNemurimasu Neiro2010-08-30 22:05:07 +0000
committerMcCabe Maxsted2010-09-02 15:25:11 -0700
commit91bf5ede7c99d7b166db2d5d03b50f5602989956 (patch)
tree8a82621fbf4e0272db5dbef482121acdb74e7466
parentlibFLAC missing from manifest (diff)
downloadmeta-impy-91bf5ede7c99d7b166db2d5d03b50f5602989956.zip
meta-impy-91bf5ede7c99d7b166db2d5d03b50f5602989956.tar.gz
meta-impy-91bf5ede7c99d7b166db2d5d03b50f5602989956.tar.bz2
meta-impy-91bf5ede7c99d7b166db2d5d03b50f5602989956.tar.xz
fix GStreamer on Mac OS
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 259f903..2bfe4ea 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -188,6 +188,9 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
188 // Protect against GStreamer resetting the locale, yuck. 188 // Protect against GStreamer resetting the locale, yuck.
189 static std::string saved_locale; 189 static std::string saved_locale;
190 saved_locale = setlocale(LC_ALL, NULL); 190 saved_locale = setlocale(LC_ALL, NULL);
191#if LL_DARWIN
192 setenv("GST_PLUGIN_SYSTEM_PATH", "lib/gstreamer-plugins", TRUE);
193#endif
191 if (0 == gst_init_check(NULL, NULL, NULL)) 194 if (0 == gst_init_check(NULL, NULL, NULL))
192 { 195 {
193 LL_WARNS("MediaImpl") << "GStreamer library failed to initialize and load standard plugins." << LL_ENDL; 196 LL_WARNS("MediaImpl") << "GStreamer library failed to initialize and load standard plugins." << LL_ENDL;