diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llui.h | 2 | ||||
-rwxr-xr-x | linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h index ebcc730..466d2c7 100644 --- a/linden/indra/llui/llui.h +++ b/linden/indra/llui/llui.h | |||
@@ -706,10 +706,12 @@ public: | |||
706 | 706 | ||
707 | // this avoids a MSVC bug where non-referenced static members are "optimized" away | 707 | // this avoids a MSVC bug where non-referenced static members are "optimized" away |
708 | // even if their constructors have side effects | 708 | // even if their constructors have side effects |
709 | // Then we avoid a compiler warning that dummy is never used. lol | ||
709 | void reference() | 710 | void reference() |
710 | { | 711 | { |
711 | S32 dummy; | 712 | S32 dummy; |
712 | dummy = 0; | 713 | dummy = 0; |
714 | dummy = dummy + 0; | ||
713 | } | 715 | } |
714 | }; | 716 | }; |
715 | 717 | ||
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 |