aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediaimplgstreamer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmedia/llmediaimplgstreamer.cpp')
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp6
1 files changed, 3 insertions, 3 deletions
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 () :
130 return; // error 130 return; // error
131 } 131 }
132 132
133 g_object_set(mPlaybin, "video-sink", mVideoSink, NULL); 133 g_object_set(mPlaybin, "video-sink", mVideoSink, (void*)NULL);
134 } 134 }
135} 135}
136 136
@@ -591,7 +591,7 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
591 setStatus( LLMediaBase::STATUS_NAVIGATING ); 591 setStatus( LLMediaBase::STATUS_NAVIGATING );
592 592
593 // set URI 593 // set URI
594 g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL); 594 g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), (void*)NULL);
595 595
596 // get playbin's bus - perhaps this can/should be done in ctor 596 // get playbin's bus - perhaps this can/should be done in ctor
597 GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (mPlaybin)); 597 GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
@@ -917,7 +917,7 @@ bool LLMediaImplGStreamer::setVolume(float volume)
917 mVolume = volume; 917 mVolume = volume;
918 if (mPlaybin) 918 if (mPlaybin)
919 { 919 {
920 g_object_set(mPlaybin, "volume", mVolume, NULL); 920 g_object_set(mPlaybin, "volume", mVolume, (void*)NULL);
921 return true; 921 return true;
922 } 922 }
923 923