From 8dbf0334202a4af22453ce50513bce26f51a3075 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 22 Sep 2006 12:08:14 +0000 Subject: gst/rtp/: Small cleanups. Original commit message from CVS: * gst/rtp/gstrtpL16depay.c: (gst_rtp_L16depay_change_state): * gst/rtp/gstrtpmp4gdepay.c: (gst_rtp_mp4g_depay_class_init): Small cleanups. * gst/rtp/Makefile.am: * gst/rtp/gstrtp.c: (plugin_init): * gst/rtp/gstrtpvorbisdepay.c: (gst_rtp_vorbis_depay_base_init), (gst_rtp_vorbis_depay_class_init), (gst_rtp_vorbis_depay_init), (gst_rtp_vorbis_depay_finalize), (gst_rtp_vorbis_depay_setcaps), (gst_rtp_vorbis_depay_process), (gst_rtp_vorbis_depay_set_property), (gst_rtp_vorbis_depay_get_property), (gst_rtp_vorbis_depay_change_state), (gst_rtp_vorbis_depay_plugin_init): * gst/rtp/gstrtpvorbisdepay.h: * gst/rtp/gstrtpvorbispay.c: (gst_rtp_vorbis_pay_base_init), (gst_rtp_vorbis_pay_class_init), (gst_rtp_vorbis_pay_init), (gst_rtp_vorbis_pay_setcaps), (gst_rtp_vorbis_pay_init_packet), (gst_rtp_vorbis_pay_flush_packet), (gst_rtp_vorbis_pay_append_buffer), (gst_rtp_vorbis_pay_handle_buffer), (gst_rtp_vorbis_pay_plugin_init): * gst/rtp/gstrtpvorbispay.h: Add experimental vorbis pay and depayloaders. --- gst/rtp/gstrtpL16depay.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gst/rtp/gstrtpL16depay.c') diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c index d46a7d85..2d052db3 100644 --- a/gst/rtp/gstrtpL16depay.c +++ b/gst/rtp/gstrtpL16depay.c @@ -318,28 +318,30 @@ static GstStateChangeReturn gst_rtp_L16depay_change_state (GstElement * element, GstStateChange transition) { GstRtpL16Depay *rtpL16depay; - - g_return_val_if_fail (GST_IS_RTP_L16_DEPAY (element), - GST_STATE_CHANGE_FAILURE); + GstStateChangeReturn ret; rtpL16depay = GST_RTP_L16_DEPAY (element); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); + switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: break; + default: + break; + } + /* if we haven't failed already, give the parent class a chance to ;-) */ + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { case GST_STATE_CHANGE_READY_TO_NULL: break; default: break; } - /* if we haven't failed already, give the parent class a chance to ;-) */ - if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - return GST_STATE_CHANGE_SUCCESS; + return ret; } gboolean -- cgit