From: <wt...@ke...> - 2007-11-16 11:17:10
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: wtay Date: Fri Nov 16 2007 11:17:13 UTC Log message: Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com> * sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get), (gst_ximagesink_change_state): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get): Don't leak the PAR on errors. Fixes #496731. Modified files: . : ChangeLog sys/ximage : ximagesink.c sys/xvimage : xvimagesink.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3604&r2=1.3605 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/sys/ximage/ximagesink.c.diff?r1=1.182&r2=1.183 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/sys/xvimage/xvimagesink.c.diff?r1=1.193&r2=1.194 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3604 retrieving revision 1.3605 diff -u -d -r1.3604 -r1.3605 --- ChangeLog 16 Nov 2007 10:14:33 -0000 1.3604 +++ ChangeLog 16 Nov 2007 11:16:56 -0000 1.3605 @@ -1,3 +1,12 @@ +2007-11-16 Wim Taymans <wim...@gm...> + + Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com> + * sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get), + (gst_ximagesink_change_state): + * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get): + Don't leak the PAR on errors. Fixes #496731. 2007-11-16 Tim-Philipp Müller <tim at centricular dot net> * gst-libs/gst/tag/gstid3tag.c: (user_tag_matches), Index: ximagesink.c RCS file: /cvs/gstreamer/gst-plugins-base/sys/ximage/ximagesink.c,v retrieving revision 1.182 retrieving revision 1.183 diff -u -d -r1.182 -r1.183 --- ximagesink.c 22 Oct 2007 10:21:45 -0000 1.182 +++ ximagesink.c 16 Nov 2007 11:16:58 -0000 1.183 @@ -1214,6 +1214,7 @@ if (!px_formats) { XCloseDisplay (xcontext->disp); g_mutex_unlock (ximagesink->x_lock); + g_free (xcontext->par); g_free (xcontext); return NULL; } Index: xvimagesink.c RCS file: /cvs/gstreamer/gst-plugins-base/sys/xvimage/xvimagesink.c,v retrieving revision 1.193 retrieving revision 1.194 diff -u -d -r1.193 -r1.194 --- xvimagesink.c 22 Oct 2007 10:21:46 -0000 1.193 +++ xvimagesink.c 16 Nov 2007 11:16:58 -0000 1.194 @@ -1645,7 +1645,6 @@ GST_DEBUG_OBJECT (xvimagesink, "X reports %dx%d pixels and %d mm x %d mm", xcontext->width, xcontext->height, xcontext->widthmm, xcontext->heightmm); - gst_xvimagesink_calculate_pixel_aspect_ratio (xcontext); /* We get supported pixmap formats at supported depth */ px_formats = XListPixmapFormats (xcontext->disp, &nb_formats); @@ -1653,6 +1652,7 @@ g_mutex_unlock (xvimagesink->x_lock); GST_ELEMENT_ERROR (xvimagesink, RESOURCE, SETTINGS, ("Could not initialise Xv output"), ("Could not get pixel formats")); @@ -1690,6 +1690,7 @@ if (!xcontext->caps) { /* GST_ELEMENT_ERROR is thrown by gst_xvimagesink_get_xv_support */ |