aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediaimplgstreamer.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-04-17 20:35:24 -0700
committerMcCabe Maxsted2009-04-17 20:35:24 -0700
commitc6f86609c7669d27f8ebad97ea6695384e17ee12 (patch)
tree7d3fe2872d8cd2e643870e36470ac4f407c1eebb /linden/indra/llmedia/llmediaimplgstreamer.cpp
parentMerged jacek/next into gst-revamp (diff)
downloadmeta-impy-c6f86609c7669d27f8ebad97ea6695384e17ee12.zip
meta-impy-c6f86609c7669d27f8ebad97ea6695384e17ee12.tar.gz
meta-impy-c6f86609c7669d27f8ebad97ea6695384e17ee12.tar.bz2
meta-impy-c6f86609c7669d27f8ebad97ea6695384e17ee12.tar.xz
GST_PLUGIN_PATH should only search plugin directories for Windows
Diffstat (limited to '')
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 7eb2b7b..5978ba3 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -291,10 +291,10 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
291 // But we also want to search the path the user has set, if any. 291 // But we also want to search the path the user has set, if any.
292 std::string plugin_path = 292 std::string plugin_path =
293 "GST_PLUGIN_PATH=" + 293 "GST_PLUGIN_PATH=" +
294 imp_dir + separator +
295#if LL_WINDOWS 294#if LL_WINDOWS
296 imp_dir + "\\lib\\gstreamer-plugins" + 295 imp_dir + "\\lib\\gstreamer-plugins" +
297#elif LL_DARWIN 296#elif LL_DARWIN
297 imp_dir + separator +
298 imp_dir + "/../Resources/lib/gstreamer-plugins" + 298 imp_dir + "/../Resources/lib/gstreamer-plugins" +
299#endif 299#endif
300 old_plugin_path; 300 old_plugin_path;