From 2d150478bbe3df6ad4abff0ff9681a352fda1108 Mon Sep 17 00:00:00 2001 From: Wouter Paesen Date: Thu, 16 Feb 2006 09:17:58 +0000 Subject: [PATCH] gst/alpha/gstalpha.c: Don't ignore return value of the parent class's state Original commit message from CVS: * 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). --- ChangeLog | 6 ++++++ gst/alpha/gstalpha.c | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba17558..b59d12a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-16 Tim-Philipp Müller + + * 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 * configure.ac: diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c index 2be593d..9596c0b 100644 --- a/gst/alpha/gstalpha.c +++ b/gst/alpha/gstalpha.c @@ -857,6 +857,7 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer) static GstStateChangeReturn gst_alpha_change_state (GstElement * element, GstStateChange transition) { + GstStateChangeReturn res; GstAlpha *alpha; alpha = GST_ALPHA (element); @@ -868,18 +869,21 @@ gst_alpha_change_state (GstElement * element, GstStateChange transition) gst_alpha_init_params (alpha); break; case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + default: break; + } + + res = parent_class->change_state (element, transition); + + switch (transition) { case GST_STATE_CHANGE_PLAYING_TO_PAUSED: - break; case GST_STATE_CHANGE_PAUSED_TO_READY: - break; case GST_STATE_CHANGE_READY_TO_NULL: + default: break; } - parent_class->change_state (element, transition); - - return GST_STATE_CHANGE_SUCCESS; + return res; } static gboolean -- 2.7.4