aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-07-15 03:59:58 +1000
committerDavid Walter Seikel2013-07-15 03:59:58 +1000
commitc7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch)
tree3eb207f344435fbeb82b142000980416d50690cd /linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
parentMore Windlight refactoring, including moving the new stuff back to lightshare.c. (diff)
parentFix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff)
downloadmeta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip
meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz
meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2
meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp')
-rwxr-xr-xlinden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index e194bf7..49bf6f9 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -312,12 +312,9 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
312static gboolean 312static gboolean
313gst_slvideo_start (GstBaseSink * bsink) 313gst_slvideo_start (GstBaseSink * bsink)
314{ 314{
315 GstSLVideo *slvideo; 315 GST_SLVIDEO(bsink);
316 gboolean ret = TRUE;
317
318 slvideo = GST_SLVIDEO(bsink);
319 316
320 return ret; 317 return TRUE;
321} 318}
322 319
323static gboolean 320static gboolean