[vlc-devel] commit: XCB-XVideo: no need to detach segment explicitly before disconnection ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 25 12:52:47 2009 +0200| [3b2885fee0df85fa24cc84f0af1f977e50737f98] | committer: Rémi Denis-Courmont 

XCB-XVideo: no need to detach segment explicitly before disconnection

The X server will do as part of garbage collection - as it does for our
window, graphic context, or if VLC crashes.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b2885fee0df85fa24cc84f0af1f977e50737f98
---

 modules/video_output/xcb/common.c |    5 +----
 modules/video_output/xcb/xvideo.c |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/xcb/common.c b/modules/video_output/xcb/common.c
index 8e0871b..80e6958 100644
--- a/modules/video_output/xcb/common.c
+++ b/modules/video_output/xcb/common.c
@@ -260,11 +260,8 @@ void PictureResourceFree (picture_resource_t *res, xcb_connection_t *conn)
 {
     xcb_shm_seg_t segment = res->p_sys->segment;
 
-    if (segment != 0)
-    {
-        assert (conn != NULL);
+    if (conn != NULL && segment != 0)
         xcb_shm_detach (conn, segment);
-    }
     shmdt (res->p->p_pixels);
 }
 
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 85b606d..d2cb1ca 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -529,7 +529,7 @@ static void Close (vlc_object_t *obj)
 
             if (!res->p->p_pixels)
                 break;
-            PictureResourceFree (res, p_sys->conn);
+            PictureResourceFree (res, NULL);
         }
         picture_pool_Delete (p_sys->pool);
     }