diff options
| author | McCabe Maxsted | 2010-10-26 20:09:25 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-26 20:09:25 -0700 |
| commit | 447b85de620dd217cb13233d814de8e80e1b9eb7 (patch) | |
| tree | 1f4977762fc71ecd175a82957b54eda690402bc9 /linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h | |
| parent | Merge remote branch 'origin/webkit_plugins' into webkit_plugins (diff) | |
| download | meta-impy-447b85de620dd217cb13233d814de8e80e1b9eb7.zip meta-impy-447b85de620dd217cb13233d814de8e80e1b9eb7.tar.gz meta-impy-447b85de620dd217cb13233d814de8e80e1b9eb7.tar.bz2 meta-impy-447b85de620dd217cb13233d814de8e80e1b9eb7.tar.xz | |
Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer loading can be sorted on windows
Diffstat (limited to '')
| -rwxr-xr-x | linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h index 0ad8cf1..5e8c72c 100755 --- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h +++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #ifndef __GST_SLVIDEO_H__ | 36 | #ifndef __GST_SLVIDEO_H__ |
| 37 | #define __GST_SLVIDEO_H__ | 37 | #define __GST_SLVIDEO_H__ |
| 38 | 38 | ||
| 39 | ///#if LL_GSTREAMER010_ENABLED | 39 | #if LL_GSTREAMER010_ENABLED |
| 40 | 40 | ||
| 41 | extern "C" { | 41 | extern "C" { |
| 42 | #include <gst/gst.h> | 42 | #include <gst/gst.h> |
| @@ -108,6 +108,6 @@ void gst_slvideo_init_class (void); | |||
| 108 | 108 | ||
| 109 | G_END_DECLS | 109 | G_END_DECLS |
| 110 | 110 | ||
| 111 | ///#endif // LL_GSTREAMER010_ENABLED | 111 | #endif // LL_GSTREAMER010_ENABLED |
| 112 | 112 | ||
| 113 | #endif /* __GST_SLVIDEO_H__ */ | 113 | #endif /* __GST_SLVIDEO_H__ */ |