From: <tp...@fr...> - 2006-02-16 09:21:30
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Thu Feb 16 2006 01:18:11 PST Log message: * gst/alpha/gstalpha.c: (gst_alpha_change_state): Don't ignore return value of the parent class's state change function (#331385, patch by: Wouter Paesen). Modified files: . : ChangeLog gst/alpha : gstalpha.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2153&r2=1.2154 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/alpha/gstalpha.c.diff?r1=1.13&r2=1.14 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2153 retrieving revision 1.2154 diff -u -d -r1.2153 -r1.2154 --- ChangeLog 15 Feb 2006 12:17:27 -0000 1.2153 +++ ChangeLog 16 Feb 2006 09:17:58 -0000 1.2154 @@ -1,3 +1,9 @@ +2006-02-16 Tim-Philipp Müller <tim at centricular dot net> + + * gst/alpha/gstalpha.c: (gst_alpha_change_state): + Don't ignore return value of the parent class's state + change function (#331385, patch by: Wouter Paesen). 2006-02-15 Wim Taymans <wi...@fl...> * configure.ac: Index: gstalpha.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/alpha/gstalpha.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gstalpha.c 22 Nov 2005 18:11:40 -0000 1.13 +++ gstalpha.c 16 Feb 2006 09:17:58 -0000 1.14 @@ -857,6 +857,7 @@ static GstStateChangeReturn gst_alpha_change_state (GstElement * element, GstStateChange transition) { + GstStateChangeReturn res; GstAlpha *alpha; alpha = GST_ALPHA (element); @@ -868,18 +869,21 @@ gst_alpha_init_params (alpha); break; case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + default: + } + res = parent_class->change_state (element, transition); + switch (transition) { case GST_STATE_CHANGE_PLAYING_TO_PAUSED: - break; case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_READY_TO_NULL: } - parent_class->change_state (element, transition); - - return GST_STATE_CHANGE_SUCCESS; + return res; } static gboolean |