aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediaimplgstreamer.h
diff options
context:
space:
mode:
authorunknown2009-01-06 01:45:09 -0700
committerunknown2009-01-06 01:45:09 -0700
commit9365711ee188a28ef52ed6fd8c07811bb725b7d2 (patch)
treef74777c7a7c4049ccb3e483a5dbf14e954730e79 /linden/indra/llmedia/llmediaimplgstreamer.h
parentchanged test version back to alpha (diff)
downloadmeta-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/llmediaimplgstreamer.h')
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 4d0638a..6deb3f4 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -31,13 +31,13 @@
31 */ 31 */
32 32
33// header guard 33// header guard
34#ifndef llmediaimplgstreamer_h 34///#ifndef llmediaimplgstreamer_h
35#define llmediaimplgstreamer_h 35#define llmediaimplgstreamer_h
36 36
37#include "llmediaimplcommon.h" 37#include "llmediaimplcommon.h"
38#include "llmediaimplfactory.h" 38#include "llmediaimplfactory.h"
39 39
40#if LL_GSTREAMER_ENABLED 40///#if LL_GSTREAMER_ENABLED
41 41
42extern "C" { 42extern "C" {
43#include <stdio.h> 43#include <stdio.h>
@@ -46,6 +46,8 @@ extern "C" {
46#include "apr_pools.h" 46#include "apr_pools.h"
47#include "apr_dso.h" 47#include "apr_dso.h"
48} 48}
49//#include <glib-object.h>
50//#include <gmain.h>
49 51
50#include "llmediaimplgstreamervidplug.h" 52#include "llmediaimplgstreamervidplug.h"
51#ifdef LL_GST_SOUNDSINK 53#ifdef LL_GST_SOUNDSINK
@@ -131,6 +133,6 @@ public:
131#define WARNMSG STDERRMSG 133#define WARNMSG STDERRMSG
132///////////////////////////////////////////////////////////////////////// 134/////////////////////////////////////////////////////////////////////////
133 135
134#endif // LL_GSTREAMER_ENABLED 136///#endif // LL_GSTREAMER_ENABLED
135 137
136#endif // llmediaimplgstreamer_h 138///#endif // llmediaimplgstreamer_h