diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
| commit | 012dfb8b33969b582f9132ac9f95402b3098ff43 (patch) | |
| tree | acff4df23e44c9d15abab2b9877c3f72032da286 /ext/xvid | |
| parent | 390621f8de27467709897c92e5fec4605d96be75 (diff) | |
| download | gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.tar.gz gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.tar.bz2 gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.zip | |
Fix up all the state change functions.
Original commit message from CVS:
Fix up all the state change functions.
Diffstat (limited to 'ext/xvid')
| -rw-r--r-- | ext/xvid/gstxviddec.c | 13 | ||||
| -rw-r--r-- | ext/xvid/gstxvidenc.c | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c index 42c716ff..44d5b267 100644 --- a/ext/xvid/gstxviddec.c +++ b/ext/xvid/gstxviddec.c @@ -78,7 +78,8 @@ gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscapslist); static GstPadLinkReturn gst_xviddec_src_link (GstPad * pad, const GstCaps * vscapslist); static GstCaps *gst_xviddec_src_getcaps (GstPad * pad); -static GstElementStateReturn gst_xviddec_change_state (GstElement * element); +static GstStateChangeReturn gst_xviddec_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -350,13 +351,13 @@ gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscaps) return ret; } -static GstElementStateReturn -gst_xviddec_change_state (GstElement * element) +static GstStateChangeReturn +gst_xviddec_change_state (GstElement * element, GstStateChange transition) { GstXvidDec *xviddec = GST_XVIDDEC (element); switch (GST_STATE_PENDING (element)) { - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: if (xviddec->handle) { gst_xviddec_unset (xviddec); } @@ -366,7 +367,7 @@ gst_xviddec_change_state (GstElement * element) } if (parent_class->change_state) - return parent_class->change_state (element); + return parent_class->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c index e71bb259..4fc4c0c7 100644 --- a/ext/xvid/gstxvidenc.c +++ b/ext/xvid/gstxvidenc.c @@ -92,7 +92,8 @@ static void gst_xvidenc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_xvidenc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstElementStateReturn gst_xvidenc_change_state (GstElement * element); +static GstStateChangeReturn gst_xvidenc_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; static guint gst_xvidenc_signals[LAST_SIGNAL] = { 0 }; @@ -473,13 +474,13 @@ gst_xvidenc_get_property (GObject * object, } } -static GstElementStateReturn -gst_xvidenc_change_state (GstElement * element) +static GstStateChangeReturn +gst_xvidenc_change_state (GstElement * element, GstStateChange transition) { GstXvidEnc *xvidenc = GST_XVIDENC (element); switch (GST_STATE_PENDING (element)) { - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: if (xvidenc->handle) { xvid_encore (xvidenc->handle, XVID_ENC_DESTROY, NULL, NULL); xvidenc->handle = NULL; @@ -490,7 +491,7 @@ gst_xvidenc_change_state (GstElement * element) } if (parent_class->change_state) - return parent_class->change_state (element); + return parent_class->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } |