From a5b7203dbdaac2c41a2a40bbd45a7050dfb96f5b Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 4 May 2010 16:47:17 +0200
Subject: replace ambiguous NULL pointers for g_object.
---
linden/indra/llmedia/llmediaimplgstreamer.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'linden/indra/llmedia')
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index a9e0004..259f903 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -130,7 +130,7 @@ LLMediaImplGStreamer () :
return; // error
}
- g_object_set(mPlaybin, "video-sink", mVideoSink, NULL);
+ g_object_set(mPlaybin, "video-sink", mVideoSink, (void*)NULL);
}
}
@@ -591,7 +591,7 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
setStatus( LLMediaBase::STATUS_NAVIGATING );
// set URI
- g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL);
+ g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), (void*)NULL);
// get playbin's bus - perhaps this can/should be done in ctor
GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
@@ -917,7 +917,7 @@ bool LLMediaImplGStreamer::setVolume(float volume)
mVolume = volume;
if (mPlaybin)
{
- g_object_set(mPlaybin, "volume", mVolume, NULL);
+ g_object_set(mPlaybin, "volume", mVolume, (void*)NULL);
return true;
}
--
cgit v1.1