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 d15070ba6be8913a96c9e475bd30b570a71e123f..84d0be9aae3020ec72340810d0482ec9ca86c189 100644 (file)
--- 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 0bde940718c93b3f47c45c00b97c5dd75e5f2e31..1766be1f86e77f8a9790b2fbfeeee2d80123d872 100644 (file)
--- 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 3790872631375b08d0ff556d932ba3f1a77142d3..7dd72331eb6f45165623213ccf04fa2586b75165 100644 (file)
--- 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;