summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorOlivier Crete <olivier.crete@collabora.co.uk>2007-11-10 05:14:01 +0000
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2009-03-03 14:34:06 -0500
commit7f0628b5f983ab7b30e94ed88b99157d53ea5bd6 (patch)
tree0559e37bc03a4cdb93acb6edadfc294cbf03bd22 /ext
parentc6187db160730015640b08706b5a69542b9491f7 (diff)
downloadgst-plugins-bad-7f0628b5f983ab7b30e94ed88b99157d53ea5bd6.tar.gz
gst-plugins-bad-7f0628b5f983ab7b30e94ed88b99157d53ea5bd6.tar.bz2
gst-plugins-bad-7f0628b5f983ab7b30e94ed88b99157d53ea5bd6.zip
[MOVED FROM GST-P-FARSIGHT] Remove the gst 0.9.1 ifdef
20071110051401-3e2dc-1f071d732d64573889977405995692d94b10a0d6.gz
Diffstat (limited to 'ext')
-rw-r--r--ext/mimic/gstmimenc.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/ext/mimic/gstmimenc.c b/ext/mimic/gstmimenc.c
index 1bc939a3..5bd48363 100644
--- a/ext/mimic/gstmimenc.c
+++ b/ext/mimic/gstmimenc.c
@@ -82,14 +82,9 @@ static GstFlowReturn gst_mimenc_chain (GstPad *pad,
static GstBuffer* gst_mimenc_create_tcp_header (GstMimEnc *mimenc,
gint payload_size);
-#if (GST_VERSION_MAJOR == 0) && (GST_VERSION_MINOR == 9) && (GST_VERSION_MICRO <= 1)
-static GstElementStateReturn
- gst_mimenc_change_state (GstElement *element);
-#else
static GstStateChangeReturn
- gst_mimenc_change_state (GstElement *element,
+ gst_mimenc_change_state (GstElement *element,
GstStateChange transition);
-#endif
static GstElementClass *parent_class = NULL;
@@ -295,15 +290,6 @@ gst_mimenc_create_tcp_header (GstMimEnc *mimenc, gint payload_size)
return buf_header;
}
-#if (GST_VERSION_MAJOR == 0) && (GST_VERSION_MINOR == 9) && (GST_VERSION_MICRO <= 1)
-static GstElementStateReturn
-gst_mimenc_change_state (GstElement * element)
-{
- GstMimEnc *mimenc;
-
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_READY_TO_NULL:
-#else
static GstStateChangeReturn
gst_mimenc_change_state (GstElement * element, GstStateChange transition)
{
@@ -311,7 +297,6 @@ gst_mimenc_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL:
-#endif
mimenc = GST_MIMENC (element);
if (mimenc->enc != NULL) {
mimic_close (mimenc->enc);
@@ -325,8 +310,5 @@ gst_mimenc_change_state (GstElement * element, GstStateChange transition)
break;
}
-#if (GST_VERSION_MAJOR == 0) && (GST_VERSION_MINOR == 9) && (GST_VERSION_MICRO <= 1)
- return GST_ELEMENT_CLASS (parent_class)->change_state (element);
-#else
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
}