diff options
author | unknown | 2009-01-06 01:45:09 -0700 |
---|---|---|
committer | unknown | 2009-01-06 01:45:09 -0700 |
commit | 9365711ee188a28ef52ed6fd8c07811bb725b7d2 (patch) | |
tree | f74777c7a7c4049ccb3e483a5dbf14e954730e79 /linden/indra/llmedia/llmediaimplgstreamervidplug.h | |
parent | changed test version back to alpha (diff) | |
download | meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.zip meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.tar.gz meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.tar.bz2 meta-impy-9365711ee188a28ef52ed6fd8c07811bb725b7d2.tar.xz |
Streaming music/video now works on Windows.
Diffstat (limited to 'linden/indra/llmedia/llmediaimplgstreamervidplug.h')
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamervidplug.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.h b/linden/indra/llmedia/llmediaimplgstreamervidplug.h index 27957db..da7de6e 100644 --- a/linden/indra/llmedia/llmediaimplgstreamervidplug.h +++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.h | |||
@@ -32,12 +32,13 @@ | |||
32 | #ifndef __GST_SLVIDEO_H__ | 32 | #ifndef __GST_SLVIDEO_H__ |
33 | #define __GST_SLVIDEO_H__ | 33 | #define __GST_SLVIDEO_H__ |
34 | 34 | ||
35 | #if LL_GSTREAMER_ENABLED | 35 | ///#if LL_GSTREAMER_ENABLED |
36 | 36 | ||
37 | extern "C" { | 37 | extern "C" { |
38 | #include <gst/gst.h> | 38 | #include <gst/gst.h> |
39 | #include <gst/video/video.h> | 39 | #include <gst/video/video.h> |
40 | #include <gst/video/gstvideosink.h> | 40 | #include <gst/video/gstvideosink.h> |
41 | #include <gthread.h> | ||
41 | } | 42 | } |
42 | 43 | ||
43 | G_BEGIN_DECLS | 44 | G_BEGIN_DECLS |
@@ -97,8 +98,11 @@ GType gst_slvideo_get_type (void); | |||
97 | 98 | ||
98 | void gst_slvideo_init_class (void); | 99 | void gst_slvideo_init_class (void); |
99 | 100 | ||
101 | bool g_once_init_enter (volatile gsize *value_location); | ||
102 | void g_once_init_leave (volatile gsize *value_location, gsize initialization_value); | ||
103 | |||
100 | G_END_DECLS | 104 | G_END_DECLS |
101 | 105 | ||
102 | #endif // LL_GSTREAMER_ENABLED | 106 | ///#endif // LL_GSTREAMER_ENABLED |
103 | 107 | ||
104 | #endif /* __GST_SLVIDEO_H__ */ | 108 | #endif /* __GST_SLVIDEO_H__ */ |