merge with master

diff --git a/packaging/gst-plugins-base.spec b/packaging/gst-plugins-base.spec
index 3f3c41e..ec435c3 100644 (file)
--- a/packaging/gst-plugins-base.spec
+++ b/packaging/gst-plugins-base.spec
@@ -1,7 +1,7 @@
 Name:       gst-plugins-base
 Summary:    GStreamer streaming media framework base plug-ins
 Version:    0.10.36
-Release:    21 
+Release:    20
 Group:      Applications/Multimedia
 License:    LGPLv2+
 Source0:    %{name}-%{version}.tar.gz

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index b2c5d56..bf264cc 100644 (file)
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -4872,18 +4872,16 @@ gst_xvimagesink_set_property (GObject * object, guint prop_id,
       g_mutex_lock( xvimagesink->x_lock );
 
       if (xvimagesink->visible && (g_value_get_boolean(value) == FALSE)) {
-        if (xvimagesink->xcontext) {
-          Atom atom_stream = XInternAtom( xvimagesink->xcontext->disp,
-                                          "_USER_WM_PORT_ATTRIBUTE_STREAM_OFF", False );
-          if (atom_stream != None) {
-            if (XvSetPortAttribute(xvimagesink->xcontext->disp,
-                                   xvimagesink->xcontext->xv_port_id,
-                                   atom_stream, 0 ) != Success) {
-              GST_WARNING_OBJECT( xvimagesink, "Set visible FALSE failed" );
-            }
-
-            XSync( xvimagesink->xcontext->disp, FALSE );
+        Atom atom_stream = XInternAtom( xvimagesink->xcontext->disp,
+                                        "_USER_WM_PORT_ATTRIBUTE_STREAM_OFF", False );
+        if (atom_stream != None) {
+          if (XvSetPortAttribute(xvimagesink->xcontext->disp,
+                                 xvimagesink->xcontext->xv_port_id,
+                                 atom_stream, 0 ) != Success) {
+            GST_WARNING_OBJECT( xvimagesink, "Set visible FALSE failed" );
           }
+
+          XSync( xvimagesink->xcontext->disp, FALSE );
         }
       } else if (!xvimagesink->visible && (g_value_get_boolean(value) == TRUE)) {
         g_mutex_unlock( xvimagesink->x_lock );