diff options
Diffstat (limited to 'ext/jpeg')
| -rw-r--r-- | ext/jpeg/gstjpegdec.c | 19 | ||||
| -rw-r--r-- | ext/jpeg/gstjpegenc.c | 17 |
2 files changed, 19 insertions, 17 deletions
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index aaf2af3f..382e457c 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -80,7 +80,8 @@ static void gst_jpeg_dec_init (GstJpegDec * jpegdec); static GstFlowReturn gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buffer); static gboolean gst_jpeg_dec_setcaps (GstPad * pad, GstCaps * caps); -static GstElementStateReturn gst_jpeg_dec_change_state (GstElement * element); +static GstStateChangeReturn gst_jpeg_dec_change_state (GstElement * element, + GstStateChange transition); GType gst_jpeg_dec_get_type (void) @@ -882,16 +883,16 @@ done: return ret; } -static GstElementStateReturn -gst_jpeg_dec_change_state (GstElement * element) +static GstStateChangeReturn +gst_jpeg_dec_change_state (GstElement * element, GstStateChange transition) { - GstElementStateReturn ret; + GstStateChangeReturn ret; GstJpegDec *dec; dec = GST_JPEG_DEC (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: dec->next_ts = 0; dec->packetized = FALSE; break; @@ -899,10 +900,10 @@ gst_jpeg_dec_change_state (GstElement * element) break; } - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_PAUSED_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: if (dec->tempbuf) { gst_buffer_unref (dec->tempbuf); dec->tempbuf = NULL; diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index e924ceb0..a94ef627 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -86,7 +86,8 @@ static void gst_jpegenc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_jpegenc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstElementStateReturn gst_jpegenc_change_state (GstElement * element); +static GstStateChangeReturn gst_jpegenc_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -503,21 +504,21 @@ gst_jpegenc_get_property (GObject * object, guint prop_id, GValue * value, } } -static GstElementStateReturn -gst_jpegenc_change_state (GstElement * element) +static GstStateChangeReturn +gst_jpegenc_change_state (GstElement * element, GstStateChange transition) { GstJpegEnc *filter = GST_JPEGENC (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: GST_DEBUG ("gst_jpegenc_change_state: setting line buffers"); filter->line[0] = NULL; filter->line[1] = NULL; filter->line[2] = NULL; gst_jpegenc_resync (filter); break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: g_free (filter->line[0]); g_free (filter->line[1]); g_free (filter->line[2]); @@ -530,7 +531,7 @@ gst_jpegenc_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; } |