diff options
| author | Nemurimasu Neiro | 2010-08-30 22:05:07 +0000 |
|---|---|---|
| committer | Jacek Antonelli | 2010-09-16 20:57:04 -0500 |
| commit | 489c8c30903df02022b72a3198297ef771410e12 (patch) | |
| tree | bc701c9ceeba9c7fe1329d7154aec7523566ed3d /linden | |
| parent | libFLAC missing from Mac manifest (diff) | |
| download | meta-impy-489c8c30903df02022b72a3198297ef771410e12.zip meta-impy-489c8c30903df02022b72a3198297ef771410e12.tar.gz meta-impy-489c8c30903df02022b72a3198297ef771410e12.tar.bz2 meta-impy-489c8c30903df02022b72a3198297ef771410e12.tar.xz | |
fix GStreamer on Mac OS
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.cpp | 3 |
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; |