mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/: Fix mistakes from thaytan's patches.

Browse source 
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.
This commit is contained in:
Julien Moutte 2004-09-22 15:59:56 +00:00
parent fbfef0cba4
commit e2f4b668d3
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2004-09-23 Jan Schmidt <thaytan@mad.scientist.com>
* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy): * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):

5
sys/ximage/ximagesink.c
View file

@ -284,7 +284,7 @@ gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink, GstXImage * ximage)
if (ximagesink->xcontext->use_xshm) { if (ximagesink->xcontext->use_xshm) {
if (ximage->SHMInfo.shmaddr != ((void *) -1)) { if (ximage->SHMInfo.shmaddr != ((void *) -1)) {
XShmDetach (ximagesink->xcontext->disp, &ximage->SHMInfo); XShmDetach (ximagesink->xcontext->disp, &ximage->SHMInfo);
XSync (xcontext->disp, 0); XSync (ximagesink->xcontext->disp, 0);
shmdt (ximage->SHMInfo.shmaddr); shmdt (ximage->SHMInfo.shmaddr);
} }
if (ximage->SHMInfo.shmid > 0) if (ximage->SHMInfo.shmid > 0)
@ -296,9 +296,6 @@ gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink, GstXImage * ximage)
#endif /* HAVE_XSHM */ #endif /* HAVE_XSHM */
{ {
if (ximage->ximage) { if (ximage->ximage) {
if (ximage->ximage->data) {
g_free (ximage->ximage->data);
}
XDestroyImage (ximage->ximage); XDestroyImage (ximage->ximage);
} }
} }

2
sys/xvimage/xvimagesink.c
View file

@ -169,7 +169,7 @@ gst_xvimagesink_check_xshm_calls (GstXContext * xcontext)
shmctl (xvimage->SHMInfo.shmid, IPC_RMID, 0); shmctl (xvimage->SHMInfo.shmid, IPC_RMID, 0);
/* To be sure, reset the SHMInfo entry */ /* 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 */ /* store whether we succeeded in result and reset error_caught */
result = !error_caught; result = !error_caught;