From c6f86609c7669d27f8ebad97ea6695384e17ee12 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 17 Apr 2009 20:35:24 -0700 Subject: GST_PLUGIN_PATH should only search plugin directories for Windows --- ChangeLog.txt | 6 ++++++ linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6fd7771..74b5f52 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2009-04-17 McCabe Maxsted + + * linden/indra/llmedia/llmediaimplgstreamer.cpp: + GST_PLUGIN_PATH should only search plugin directories for Windows. + + 2009-04-06 Jacek Antonelli * linden/indra/llmedia/llmediaimplgstreamer.cpp: 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() // But we also want to search the path the user has set, if any. std::string plugin_path = "GST_PLUGIN_PATH=" + - imp_dir + separator + #if LL_WINDOWS imp_dir + "\\lib\\gstreamer-plugins" + #elif LL_DARWIN + imp_dir + separator + imp_dir + "/../Resources/lib/gstreamer-plugins" + #endif old_plugin_path; -- cgit v1.1