From: Julien Moutte <julien@moutte.net>
Date: Wed, 22 Sep 2004 15:59:56 +0000 (+0000)
Subject: sys/: Fix mistakes from thaytan's patches.
X-Git-Tag: 1.19.3~511^2~13721
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2f4b668d321350175a0d5191a76d41c0b54cf20;p=platform%2Fupstream%2Fgstreamer.git

sys/: Fix mistakes from thaytan's patches.

Original commit message from CVS:
2004-09-22  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls): Fix
mistakes from thaytan's patches.
---

diff --git a/ChangeLog b/ChangeLog
index d15070ba6b..84d0be9aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-22  Julien MOUTTE  <julien@moutte.net>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls): Fix 
+	mistakes from thaytan's patches.
+
 2004-09-23  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 0bde940718..1766be1f86 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -284,7 +284,7 @@ gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink, GstXImage * ximage)
   if (ximagesink->xcontext->use_xshm) {
     if (ximage->SHMInfo.shmaddr != ((void *) -1)) {
       XShmDetach (ximagesink->xcontext->disp, &ximage->SHMInfo);
-      XSync (xcontext->disp, 0);
+      XSync (ximagesink->xcontext->disp, 0);
       shmdt (ximage->SHMInfo.shmaddr);
     }
     if (ximage->SHMInfo.shmid > 0)
@@ -296,9 +296,6 @@ gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink, GstXImage * ximage)
 #endif /* HAVE_XSHM */
   {
     if (ximage->ximage) {
-      if (ximage->ximage->data) {
-        g_free (ximage->ximage->data);
-      }
       XDestroyImage (ximage->ximage);
     }
   }
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 3790872631..7dd72331eb 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -169,7 +169,7 @@ gst_xvimagesink_check_xshm_calls (GstXContext * xcontext)
   shmctl (xvimage->SHMInfo.shmid, IPC_RMID, 0);
 
   /* To be sure, reset the SHMInfo entry */
-  ximage->SHMInfo.shmaddr = ((void *) -1);
+  xvimage->SHMInfo.shmaddr = ((void *) -1);
 
   /* store whether we succeeded in result and reset error_caught */
   result = !error_caught;