From 3c02efe7988c2c9d1a369f17549ca94deb40373b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 6 Sep 2005 12:00:33 +0000 Subject: [PATCH] ext/amrnb/: State change function updates. Original commit message from CVS: * ext/amrnb/amrnbdec.c: (gst_amrnbdec_state_change): * ext/amrnb/amrnbenc.c: (gst_amrnbenc_state_change): * ext/amrnb/amrnbparse.c: (gst_amrnbparse_state_change): State change function updates. --- ChangeLog | 7 +++++++ common | 2 +- ext/amrnb/amrnbdec.c | 5 +++-- ext/amrnb/amrnbenc.c | 5 +++-- ext/amrnb/amrnbparse.c | 5 +++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e312d077c8..78a38ee9dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-06 Wim Taymans + + * ext/amrnb/amrnbdec.c: (gst_amrnbdec_state_change): + * ext/amrnb/amrnbenc.c: (gst_amrnbenc_state_change): + * ext/amrnb/amrnbparse.c: (gst_amrnbparse_state_change): + State change function updates. + 2005-09-05 Jan Schmidt * ext/mpeg2dec/gstmpeg2dec.c: diff --git a/common b/common index 5488690249..00cc4f5af9 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 54886902497be267fe1f1a3f9c4dc0245bc46175 +Subproject commit 00cc4f5af95a15be55b8c1b3eed09f4738412f91 diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c index 9f9ea4e17d..169f8e0286 100644 --- a/ext/amrnb/amrnbdec.c +++ b/ext/amrnb/amrnbdec.c @@ -50,7 +50,8 @@ static void gst_amrnbdec_init (GstAmrnbDec * amrnbdec); static GstFlowReturn gst_amrnbdec_chain (GstPad * pad, GstBuffer * buffer); static gboolean gst_amrnbdec_setcaps (GstPad * pad, GstCaps * caps); -static GstStateChangeReturn gst_amrnbdec_state_change (GstElement * element); +static GstStateChangeReturn gst_amrnbdec_state_change (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -226,7 +227,7 @@ not_negotiated: } static GstStateChangeReturn -gst_amrnbdec_state_change (GstElement * element) +gst_amrnbdec_state_change (GstElement * element, GstStateChange transition) { GstAmrnbDec *amrnbdec; GstStateChangeReturn ret; diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c index ece0e07c64..855310b2c1 100644 --- a/ext/amrnb/amrnbenc.c +++ b/ext/amrnb/amrnbenc.c @@ -47,7 +47,8 @@ static void gst_amrnbenc_finalize (GObject * object); static GstFlowReturn gst_amrnbenc_chain (GstPad * pad, GstBuffer * buffer); static gboolean gst_amrnbenc_setcaps (GstPad * pad, GstCaps * caps); -static GstStateChangeReturn gst_amrnbenc_state_change (GstElement * element); +static GstStateChangeReturn gst_amrnbenc_state_change (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -237,7 +238,7 @@ not_negotiated: } static GstStateChangeReturn -gst_amrnbenc_state_change (GstElement * element) +gst_amrnbenc_state_change (GstElement * element, GstStateChange transition) { GstAmrnbEnc *amrnbenc; GstStateChangeReturn ret; diff --git a/ext/amrnb/amrnbparse.c b/ext/amrnb/amrnbparse.c index 35583ccfa6..53ca72abe4 100644 --- a/ext/amrnb/amrnbparse.c +++ b/ext/amrnb/amrnbparse.c @@ -56,7 +56,8 @@ static gboolean gst_amrnbparse_event (GstPad * pad, GstEvent * event); static GstFlowReturn gst_amrnbparse_chain (GstPad * pad, GstBuffer * buffer); static void gst_amrnbparse_loop (GstPad * pad); static gboolean gst_amrnbparse_sink_activate (GstPad * sinkpad); -static GstStateChangeReturn gst_amrnbparse_state_change (GstElement * element); +static GstStateChangeReturn gst_amrnbparse_state_change (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -473,7 +474,7 @@ gst_amrnbparse_sink_activate (GstPad * sinkpad) } static GstStateChangeReturn -gst_amrnbparse_state_change (GstElement * element) +gst_amrnbparse_state_change (GstElement * element, GstStateChange transition) { GstAmrnbParse *amrnbparse; GstStateChangeReturn ret;