diff options
Diffstat (limited to 'gst/avi')
| -rw-r--r-- | gst/avi/gstavidemux.c | 15 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 18 |
2 files changed, 17 insertions, 16 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index bd354935..eb084bd7 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -64,7 +64,8 @@ static void gst_avi_demux_loop (GstPad * pad); static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad); static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad, gboolean active); -static GstElementStateReturn gst_avi_demux_change_state (GstElement * element); +static GstStateChangeReturn gst_avi_demux_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -2189,13 +2190,13 @@ gst_avi_demux_sink_activate_pull (GstPad * sinkpad, gboolean active) return TRUE; } -static GstElementStateReturn -gst_avi_demux_change_state (GstElement * element) +static GstStateChangeReturn +gst_avi_demux_change_state (GstElement * element, GstStateChange transition) { GstAviDemux *avi = GST_AVI_DEMUX (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_PAUSED_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: gst_avi_demux_reset (avi); break; default: @@ -2203,7 +2204,7 @@ gst_avi_demux_change_state (GstElement * element) } if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element); + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index feac45e1..31a87adb 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -155,7 +155,8 @@ static void gst_avimux_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_avimux_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstElementStateReturn gst_avimux_change_state (GstElement * element); +static GstStateChangeReturn gst_avimux_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -1308,21 +1309,20 @@ gst_avimux_set_property (GObject * object, } } -static GstElementStateReturn -gst_avimux_change_state (GstElement * element) +static GstStateChangeReturn +gst_avimux_change_state (GstElement * element, GstStateChange transition) { GstAviMux *avimux; - gint transition = GST_STATE_TRANSITION (element); - g_return_val_if_fail (GST_IS_AVIMUX (element), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_AVIMUX (element), GST_STATE_CHANGE_FAILURE); avimux = GST_AVIMUX (element); switch (transition) { - case GST_STATE_PAUSED_TO_PLAYING: + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: avimux->video_pad_eos = avimux->audio_pad_eos = FALSE; break; - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: if (avimux->tags) { gst_tag_list_free (avimux->tags); avimux->tags = NULL; @@ -1331,7 +1331,7 @@ gst_avimux_change_state (GstElement * element) } if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element); + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } |