aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/media_plugins
diff options
context:
space:
mode:
authorJacek Antonelli2010-11-13 15:29:51 -0600
committerJacek Antonelli2010-11-13 15:29:51 -0600
commit43f6513eaf38d3c21dcf0aef8cb1cd61a6860f18 (patch)
tree84b77719870974065a74cf231e6dce7d7c19633c /linden/indra/media_plugins
parentDisable SSE4 on Mac (temporarily). (diff)
downloadmeta-impy-43f6513eaf38d3c21dcf0aef8cb1cd61a6860f18.zip
meta-impy-43f6513eaf38d3c21dcf0aef8cb1cd61a6860f18.tar.gz
meta-impy-43f6513eaf38d3c21dcf0aef8cb1cd61a6860f18.tar.bz2
meta-impy-43f6513eaf38d3c21dcf0aef8cb1cd61a6860f18.tar.xz
GStreamer010 plugin needs Carbon.h on Mac.
Diffstat (limited to 'linden/indra/media_plugins')
-rwxr-xr-xlinden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 78e46ca..ed6d920 100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -42,6 +42,10 @@
42#include <stdio.h> 42#include <stdio.h>
43#endif 43#endif
44 44
45#ifdef LL_DARWIN
46#include <Carbon/Carbon.h>
47#endif
48
45#include "llgl.h" 49#include "llgl.h"
46 50
47#include "llplugininstance.h" 51#include "llplugininstance.h"