diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c
index 70ffbc7a06..1c91ce1952 100644
--- a/ext/dts/gstdtsdec.c
+++ b/ext/dts/gstdtsdec.c
@@ -131,7 +131,7 @@ G_DEFINE_TYPE (GstDtsDec, gst_dtsdec, GST_TYPE_AUDIO_DECODER);
 static gboolean gst_dtsdec_start (GstAudioDecoder * dec);
 static gboolean gst_dtsdec_stop (GstAudioDecoder * dec);
 static gboolean gst_dtsdec_set_format (GstAudioDecoder * bdec, GstCaps * caps);
-static gboolean gst_dtsdec_parse (GstAudioDecoder * dec, GstAdapter * adapter,
+static GstFlowReturn gst_dtsdec_parse (GstAudioDecoder * dec, GstAdapter * adapter,
     gint * offset, gint * length);
 static GstFlowReturn gst_dtsdec_handle_frame (GstAudioDecoder * dec,
     GstBuffer * buffer);
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index 07cca309aa..09d927c82e 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -93,7 +93,7 @@ static void gst_faad_reset (GstFaad * faad);
 static gboolean gst_faad_start (GstAudioDecoder * dec);
 static gboolean gst_faad_stop (GstAudioDecoder * dec);
 static gboolean gst_faad_set_format (GstAudioDecoder * dec, GstCaps * caps);
-static gboolean gst_faad_parse (GstAudioDecoder * dec, GstAdapter * adapter,
+static GstFlowReturn gst_faad_parse (GstAudioDecoder * dec, GstAdapter * adapter,
     gint * offset, gint * length);
 static GstFlowReturn gst_faad_handle_frame (GstAudioDecoder * dec,
     GstBuffer * buffer);
diff --git a/ext/gl/gstglviewconvert.c b/ext/gl/gstglviewconvert.c
index ba05a11f1a..617df449d1 100644
--- a/ext/gl/gstglviewconvert.c
+++ b/ext/gl/gstglviewconvert.c
@@ -88,7 +88,7 @@ static GstCaps *gst_gl_view_convert_element_fixate_caps (GstBaseTransform *
 static GstFlowReturn
 gst_gl_view_convert_element_submit_input_buffer (GstBaseTransform * trans,
     gboolean is_discont, GstBuffer * input);
-static gboolean
+static GstFlowReturn
 gst_gl_view_convert_element_generate_output_buffer (GstBaseTransform * bt,
     GstBuffer ** outbuf);
 
diff --git a/ext/schroedinger/gstschrodec.c b/ext/schroedinger/gstschrodec.c
index 359a5940f8..693e31c8bd 100644
--- a/ext/schroedinger/gstschrodec.c
+++ b/ext/schroedinger/gstschrodec.c
@@ -93,7 +93,7 @@ static GstFlowReturn gst_schro_dec_parse (GstVideoDecoder *
     gboolean at_eos);
 static GstFlowReturn gst_schro_dec_handle_frame (GstVideoDecoder * decoder,
     GstVideoCodecFrame * frame);
-static gboolean gst_schro_dec_finish (GstVideoDecoder * base_video_decoder);
+static GstFlowReturn gst_schro_dec_finish (GstVideoDecoder * base_video_decoder);
 static void gst_schrodec_send_tags (GstSchroDec * schro_dec);
 static gboolean gst_schro_dec_decide_allocation (GstVideoDecoder * decoder,
     GstQuery * query);
@@ -557,7 +557,7 @@ gst_schro_dec_handle_frame (GstVideoDecoder * base_video_decoder,
   return gst_schro_dec_process (schro_dec, FALSE);
 }
 
-gboolean
+GstFlowReturn
 gst_schro_dec_finish (GstVideoDecoder * base_video_decoder)
 {
   GstSchroDec *schro_dec;
diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c
index a09b8a4446..8d66225930 100644
--- a/gst-libs/gst/audio/gstaudioaggregator.c
+++ b/gst-libs/gst/audio/gstaudioaggregator.c
@@ -74,7 +74,7 @@ struct _GstAudioAggregatorPadPrivate
 G_DEFINE_TYPE (GstAudioAggregatorPad, gst_audio_aggregator_pad,
     GST_TYPE_AGGREGATOR_PAD);
 
-static gboolean
+static GstFlowReturn
 gst_audio_aggregator_pad_flush_pad (GstAggregatorPad * aggpad,
     GstAggregator * aggregator);
 
@@ -118,7 +118,7 @@ gst_audio_aggregator_pad_init (GstAudioAggregatorPad * pad)
 }
 
 
-static gboolean
+static GstFlowReturn
 gst_audio_aggregator_pad_flush_pad (GstAggregatorPad * aggpad,
     GstAggregator * aggregator)
 {
@@ -131,7 +131,7 @@ gst_audio_aggregator_pad_flush_pad (GstAggregatorPad * aggpad,
   gst_buffer_replace (&pad->priv->buffer, NULL);
   GST_OBJECT_UNLOCK (aggpad);
 
-  return TRUE;
+  return GST_FLOW_OK;
 }