diff options
| author | Jacek Antonelli | 2009-03-29 22:28:41 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-03-29 22:28:41 -0500 |
| commit | b1412201b6e44c1a304acd70d9104d3a2034da52 (patch) | |
| tree | ccf7f34d58cd06b5696fce329e3088091e50f4bd /linden/indra/llmedia | |
| parent | Improved set_gst_plugin_path, now sets path on Mac too. (diff) | |
| download | meta-impy-b1412201b6e44c1a304acd70d9104d3a2034da52.zip meta-impy-b1412201b6e44c1a304acd70d9104d3a2034da52.tar.gz meta-impy-b1412201b6e44c1a304acd70d9104d3a2034da52.tar.bz2 meta-impy-b1412201b6e44c1a304acd70d9104d3a2034da52.tar.xz | |
set_gst_plugin_path now sets GST_PLUGIN_SYSTEM_PATH="".
This prevents GStreamer from looking for system-installed plugins,
which can have conflicts with our packaged ones.
Diffstat (limited to 'linden/indra/llmedia')
| -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 20b89f5..270b08b 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp | |||
| @@ -282,6 +282,9 @@ void LLMediaImplGStreamer::set_gst_plugin_path() | |||
| 282 | LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to " | 282 | LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to " |
| 283 | << getenv("GST_PLUGIN_PATH") << LL_ENDL; | 283 | << getenv("GST_PLUGIN_PATH") << LL_ENDL; |
| 284 | 284 | ||
| 285 | // Disable loading system plugins. We only want to use ours, to avoid conflicts. | ||
| 286 | putenv( "GST_PLUGIN_SYSTEM_PATH=\"\"" ); | ||
| 287 | |||
| 285 | #endif // LL_WINDOWS || LL_DARWIN | 288 | #endif // LL_WINDOWS || LL_DARWIN |
| 286 | } | 289 | } |
| 287 | 290 | ||