diff options
author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp | |
parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
download | meta-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-x | linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp | 7 |
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) | |||
312 | static gboolean | 312 | static gboolean |
313 | gst_slvideo_start (GstBaseSink * bsink) | 313 | gst_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 | ||
323 | static gboolean | 320 | static gboolean |