22 files changed, 198 insertions, 212 deletions

diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c
index 59a49b8b..2caf350c 100644
--- a/gst/rtp/gstrtpL16depay.c
+++ b/gst/rtp/gstrtpL16depay.c
@@ -70,8 +70,7 @@ static void gst_rtpL16parse_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_rtpL16parse_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_rtpL16parse_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtpL16parse_change_state (GstElement * element);
 
 static GstElementClass *parent_class = NULL;
 
@@ -310,21 +309,22 @@ gst_rtpL16parse_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpL16parse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpL16parse_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpL16Parse *rtpL16parse;
 
-  g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element),
+      GST_STATE_CHANGE_FAILURE);
 
   rtpL16parse = GST_RTP_L16_PARSE (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
@@ -332,9 +332,9 @@ gst_rtpL16parse_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtpL16enc.c b/gst/rtp/gstrtpL16enc.c
index a5808b0f..aecd21ad 100644
--- a/gst/rtp/gstrtpL16enc.c
+++ b/gst/rtp/gstrtpL16enc.c
@@ -74,7 +74,8 @@ static void gst_rtpL16enc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static GstPadLinkReturn gst_rtpL16enc_sinkconnect (GstPad * pad,
     const GstCaps * caps);
-static GstElementStateReturn gst_rtpL16enc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpL16enc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -306,23 +307,23 @@ gst_rtpL16enc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpL16enc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpL16enc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpL16Enc *rtpL16enc;
 
-  g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_CHANGE_FAILURE);
 
   rtpL16enc = GST_RTP_L16_ENC (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
   /* if going down into NULL state, close the file if it's open */
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
 
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
 
     default:
@@ -331,9 +332,9 @@ gst_rtpL16enc_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtpL16parse.c b/gst/rtp/gstrtpL16parse.c
index 59a49b8b..2caf350c 100644
--- a/gst/rtp/gstrtpL16parse.c
+++ b/gst/rtp/gstrtpL16parse.c
@@ -70,8 +70,7 @@ static void gst_rtpL16parse_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_rtpL16parse_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_rtpL16parse_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtpL16parse_change_state (GstElement * element);
 
 static GstElementClass *parent_class = NULL;
 
@@ -310,21 +309,22 @@ gst_rtpL16parse_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpL16parse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpL16parse_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpL16Parse *rtpL16parse;
 
-  g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element),
+      GST_STATE_CHANGE_FAILURE);
 
   rtpL16parse = GST_RTP_L16_PARSE (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
@@ -332,9 +332,9 @@ gst_rtpL16parse_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtpL16pay.c b/gst/rtp/gstrtpL16pay.c
index a5808b0f..aecd21ad 100644
--- a/gst/rtp/gstrtpL16pay.c
+++ b/gst/rtp/gstrtpL16pay.c
@@ -74,7 +74,8 @@ static void gst_rtpL16enc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static GstPadLinkReturn gst_rtpL16enc_sinkconnect (GstPad * pad,
     const GstCaps * caps);
-static GstElementStateReturn gst_rtpL16enc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpL16enc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -306,23 +307,23 @@ gst_rtpL16enc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpL16enc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpL16enc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpL16Enc *rtpL16enc;
 
-  g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_CHANGE_FAILURE);
 
   rtpL16enc = GST_RTP_L16_ENC (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
   /* if going down into NULL state, close the file if it's open */
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
 
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
 
     default:
@@ -331,9 +332,9 @@ gst_rtpL16enc_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtpamrdec.c b/gst/rtp/gstrtpamrdec.c
index 701f2dd3..c242a79c 100644
--- a/gst/rtp/gstrtpamrdec.c
+++ b/gst/rtp/gstrtpamrdec.c
@@ -93,7 +93,8 @@ static void gst_rtpamrdec_set_property (GObject * object, guint prop_id,
 static void gst_rtpamrdec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpamrdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpamrdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -379,20 +380,18 @@ gst_rtpamrdec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpamrdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpamrdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpAMRDec *rtpamrdec;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpamrdec = GST_RTP_AMR_DEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       /* FIXME, don't require negotiation until all elements
        * do */
       rtpamrdec->negotiated = TRUE;
@@ -401,10 +400,10 @@ gst_rtpamrdec_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 (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c
index 701f2dd3..c242a79c 100644
--- a/gst/rtp/gstrtpamrdepay.c
+++ b/gst/rtp/gstrtpamrdepay.c
@@ -93,7 +93,8 @@ static void gst_rtpamrdec_set_property (GObject * object, guint prop_id,
 static void gst_rtpamrdec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpamrdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpamrdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -379,20 +380,18 @@ gst_rtpamrdec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpamrdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpamrdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpAMRDec *rtpamrdec;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpamrdec = GST_RTP_AMR_DEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       /* FIXME, don't require negotiation until all elements
        * do */
       rtpamrdec->negotiated = TRUE;
@@ -401,10 +400,10 @@ gst_rtpamrdec_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 (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpamrenc.c b/gst/rtp/gstrtpamrenc.c
index 198ce166..a60648d7 100644
--- a/gst/rtp/gstrtpamrenc.c
+++ b/gst/rtp/gstrtpamrenc.c
@@ -92,7 +92,8 @@ static void gst_rtpamrenc_set_property (GObject * object, guint prop_id,
 static void gst_rtpamrenc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpamrenc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpamrenc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -312,30 +313,28 @@ gst_rtpamrenc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpamrenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpamrenc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpAMREnc *rtpamrenc;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpamrenc = GST_RTP_AMR_ENC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       rtpamrenc->seqnum = 0;
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c
index 198ce166..a60648d7 100644
--- a/gst/rtp/gstrtpamrpay.c
+++ b/gst/rtp/gstrtpamrpay.c
@@ -92,7 +92,8 @@ static void gst_rtpamrenc_set_property (GObject * object, guint prop_id,
 static void gst_rtpamrenc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpamrenc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpamrenc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -312,30 +313,28 @@ gst_rtpamrenc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpamrenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpamrenc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpAMREnc *rtpamrenc;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpamrenc = GST_RTP_AMR_ENC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       rtpamrenc->seqnum = 0;
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpdec.c b/gst/rtp/gstrtpdec.c
index bb8a7afd..a7e7f6b8 100644
--- a/gst/rtp/gstrtpdec.c
+++ b/gst/rtp/gstrtpdec.c
@@ -82,7 +82,8 @@ static void gst_rtpdec_set_property (GObject * object,
 static void gst_rtpdec_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -226,27 +227,25 @@ gst_rtpdec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpdec_change_state (GstElement * element, GstStateChange transition)
 {
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
   GstRTPDec *rtpdec;
-  gint transition;
 
   rtpdec = GST_RTPDEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpdepay.c b/gst/rtp/gstrtpdepay.c
index bb8a7afd..a7e7f6b8 100644
--- a/gst/rtp/gstrtpdepay.c
+++ b/gst/rtp/gstrtpdepay.c
@@ -82,7 +82,8 @@ static void gst_rtpdec_set_property (GObject * object,
 static void gst_rtpdec_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -226,27 +227,25 @@ gst_rtpdec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpdec_change_state (GstElement * element, GstStateChange transition)
 {
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
   GstRTPDec *rtpdec;
-  gint transition;
 
   rtpdec = GST_RTPDEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpgsmdepay.c b/gst/rtp/gstrtpgsmdepay.c
index 8b7337b1..78171cbf 100644
--- a/gst/rtp/gstrtpgsmdepay.c
+++ b/gst/rtp/gstrtpgsmdepay.c
@@ -66,8 +66,7 @@ static void gst_rtpgsmparse_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_rtpgsmparse_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_rtpgsmparse_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtpgsmparse_change_state (GstElement * element);
 
 static GstElementClass *parent_class = NULL;
 
@@ -272,21 +271,22 @@ gst_rtpgsmparse_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpgsmparse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpgsmparse_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpGSMParse *rtpgsmparse;
 
-  g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element),
+      GST_STATE_CHANGE_FAILURE);
 
   rtpgsmparse = GST_RTP_GSM_PARSE (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
@@ -294,9 +294,9 @@ gst_rtpgsmparse_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtpgsmenc.c b/gst/rtp/gstrtpgsmenc.c
index faf73e48..47daa430 100644
--- a/gst/rtp/gstrtpgsmenc.c
+++ b/gst/rtp/gstrtpgsmenc.c
@@ -71,7 +71,8 @@ static void gst_rtpgsmenc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static GstPadLinkReturn gst_rtpgsmenc_sinkconnect (GstPad * pad,
     const GstCaps * caps);
-static GstElementStateReturn gst_rtpgsmenc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpgsmenc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -292,23 +293,23 @@ gst_rtpgsmenc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpgsmenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpgsmenc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpGSMEnc *rtpgsmenc;
 
-  g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_CHANGE_FAILURE);
 
   rtpgsmenc = GST_RTP_GSM_ENC (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
   /* if going down into NULL state, close the file if it's open */
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
 
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
 
     default:
@@ -317,9 +318,9 @@ gst_rtpgsmenc_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtpgsmparse.c b/gst/rtp/gstrtpgsmparse.c
index 8b7337b1..78171cbf 100644
--- a/gst/rtp/gstrtpgsmparse.c
+++ b/gst/rtp/gstrtpgsmparse.c
@@ -66,8 +66,7 @@ static void gst_rtpgsmparse_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_rtpgsmparse_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_rtpgsmparse_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtpgsmparse_change_state (GstElement * element);
 
 static GstElementClass *parent_class = NULL;
 
@@ -272,21 +271,22 @@ gst_rtpgsmparse_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpgsmparse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpgsmparse_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpGSMParse *rtpgsmparse;
 
-  g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element),
+      GST_STATE_CHANGE_FAILURE);
 
   rtpgsmparse = GST_RTP_GSM_PARSE (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
@@ -294,9 +294,9 @@ gst_rtpgsmparse_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtpgsmpay.c b/gst/rtp/gstrtpgsmpay.c
index faf73e48..47daa430 100644
--- a/gst/rtp/gstrtpgsmpay.c
+++ b/gst/rtp/gstrtpgsmpay.c
@@ -71,7 +71,8 @@ static void gst_rtpgsmenc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static GstPadLinkReturn gst_rtpgsmenc_sinkconnect (GstPad * pad,
     const GstCaps * caps);
-static GstElementStateReturn gst_rtpgsmenc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpgsmenc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -292,23 +293,23 @@ gst_rtpgsmenc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpgsmenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpgsmenc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpGSMEnc *rtpgsmenc;
 
-  g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_CHANGE_FAILURE);
 
   rtpgsmenc = GST_RTP_GSM_ENC (element);
 
   GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
   /* if going down into NULL state, close the file if it's open */
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
 
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
 
     default:
@@ -317,9 +318,9 @@ gst_rtpgsmenc_change_state (GstElement * element)
 
   /* 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);
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 gboolean
diff --git a/gst/rtp/gstrtph263pdec.c b/gst/rtp/gstrtph263pdec.c
index 1ffc30e6..62c2d61c 100644
--- a/gst/rtp/gstrtph263pdec.c
+++ b/gst/rtp/gstrtph263pdec.c
@@ -68,8 +68,8 @@ static void gst_rtph263pdec_set_property (GObject * object, guint prop_id,
 static void gst_rtph263pdec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtph263pdec_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtph263pdec_change_state (GstElement *
+    element, GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -281,27 +281,25 @@ gst_rtph263pdec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtph263pdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtph263pdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpH263PDec *rtph263pdec;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtph263pdec = GST_RTP_H263P_DEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtph263pdepay.c b/gst/rtp/gstrtph263pdepay.c
index 1ffc30e6..62c2d61c 100644
--- a/gst/rtp/gstrtph263pdepay.c
+++ b/gst/rtp/gstrtph263pdepay.c
@@ -68,8 +68,8 @@ static void gst_rtph263pdec_set_property (GObject * object, guint prop_id,
 static void gst_rtph263pdec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtph263pdec_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtph263pdec_change_state (GstElement *
+    element, GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -281,27 +281,25 @@ gst_rtph263pdec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtph263pdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtph263pdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpH263PDec *rtph263pdec;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtph263pdec = GST_RTP_H263P_DEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtph263penc.c b/gst/rtp/gstrtph263penc.c
index a875ed07..192466d5 100644
--- a/gst/rtp/gstrtph263penc.c
+++ b/gst/rtp/gstrtph263penc.c
@@ -75,8 +75,8 @@ static void gst_rtph263penc_set_property (GObject * object, guint prop_id,
 static void gst_rtph263penc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtph263penc_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtph263penc_change_state (GstElement *
+    element, GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -298,27 +298,25 @@ gst_rtph263penc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtph263penc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtph263penc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpH263PEnc *rtph263penc;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtph263penc = GST_RTP_H263P_ENC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtph263ppay.c b/gst/rtp/gstrtph263ppay.c
index a875ed07..192466d5 100644
--- a/gst/rtp/gstrtph263ppay.c
+++ b/gst/rtp/gstrtph263ppay.c
@@ -75,8 +75,8 @@ static void gst_rtph263penc_set_property (GObject * object, guint prop_id,
 static void gst_rtph263penc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtph263penc_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_rtph263penc_change_state (GstElement *
+    element, GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -298,27 +298,25 @@ gst_rtph263penc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtph263penc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtph263penc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpH263PEnc *rtph263penc;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtph263penc = GST_RTP_H263P_ENC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpmpadec.c b/gst/rtp/gstrtpmpadec.c
index 970aed96..d969100c 100644
--- a/gst/rtp/gstrtpmpadec.c
+++ b/gst/rtp/gstrtpmpadec.c
@@ -68,7 +68,8 @@ static void gst_rtpmpadec_set_property (GObject * object, guint prop_id,
 static void gst_rtpmpadec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpmpadec_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpmpadec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -236,27 +237,25 @@ gst_rtpmpadec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpmpadec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpmpadec_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpMPADec *rtpmpadec;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpmpadec = GST_RTP_MPA_DEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c
index 970aed96..d969100c 100644
--- a/gst/rtp/gstrtpmpadepay.c
+++ b/gst/rtp/gstrtpmpadepay.c
@@ -68,7 +68,8 @@ static void gst_rtpmpadec_set_property (GObject * object, guint prop_id,
 static void gst_rtpmpadec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpmpadec_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpmpadec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -236,27 +237,25 @@ gst_rtpmpadec_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpmpadec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpmpadec_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpMPADec *rtpmpadec;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpmpadec = GST_RTP_MPA_DEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpmpaenc.c b/gst/rtp/gstrtpmpaenc.c
index 991b09dc..58b37522 100644
--- a/gst/rtp/gstrtpmpaenc.c
+++ b/gst/rtp/gstrtpmpaenc.c
@@ -71,7 +71,8 @@ static void gst_rtpmpaenc_set_property (GObject * object, guint prop_id,
 static void gst_rtpmpaenc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpmpaenc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpmpaenc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -292,30 +293,28 @@ gst_rtpmpaenc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpmpaenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpmpaenc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpMPAEnc *rtpmpaenc;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpmpaenc = GST_RTP_MPA_ENC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       rtpmpaenc->seqnum = 0;
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c
index 991b09dc..58b37522 100644
--- a/gst/rtp/gstrtpmpapay.c
+++ b/gst/rtp/gstrtpmpapay.c
@@ -71,7 +71,8 @@ static void gst_rtpmpaenc_set_property (GObject * object, guint prop_id,
 static void gst_rtpmpaenc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_rtpmpaenc_change_state (GstElement * element);
+static GstStateChangeReturn gst_rtpmpaenc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -292,30 +293,28 @@ gst_rtpmpaenc_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_rtpmpaenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rtpmpaenc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRtpMPAEnc *rtpmpaenc;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   rtpmpaenc = GST_RTP_MPA_ENC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       rtpmpaenc->seqnum = 0;
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;