2 files changed, 19 insertions, 8 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 577ce48..c3878ab 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
 2009-03-08  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Load the proper gstreamer lib type (dylib) on Mac.
+
+
         * linden/indra/cmake/GStreamer.cmake:
         Tweaked GStreamer.cmake to work on Mac.
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 30706f1..cd6c91b 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -166,19 +166,26 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 g_type_init();
 
                 // Get symbols!
+                if (
 #if LL_WINDOWS
-                if (! grab_gst_syms("libgstreamer-0.10.dll", "libgstvideo-0.10.dll", "libgstaudio-0.10.dll") )
-                {
-                    LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL;
-                        return false;
-                }
+                          ! grab_gst_syms("libgstreamer-0.10.dll",
+                                                "libgstvideo-0.10.dll",
+                                                "libgstaudio-0.10.dll")
+#elif LL_DARWIN
+                          ! grab_gst_syms("libgstreamer-0.10.dylib",
+                                                "libgstvideo-0.10.dylib",
+                                                "libgstaudio-0.10.dylib")
 #else
-                if (! grab_gst_syms("libgstreamer-0.10.so.0", "libgstvideo-0.10.so.0", "libgstaudio-0.10.so.0") )
+                          ! grab_gst_syms("libgstreamer-0.10.so.0",
+                                                "libgstvideo-0.10.so.0",
+                                                "libgstaudio-0.10.so.0")
+#endif
+                                )
                 {
-                        LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL;
+                    LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL;
                         return false;
                 }
-#endif
+
                 if (llgst_segtrap_set_enabled)
                         llgst_segtrap_set_enabled(FALSE);
                 else