From a3d58818e812ae1c7f10dcfc6d00e8368c6735ec Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 11 Jul 2016 19:21:11 +0530 Subject: [PATCH] Fix various gboolean vs GstFlowReturn problems Caught by building with MSVC which gave warnings for these --- gst-libs/gst/video/gstvideoaggregator.c | 4 ++-- gst/siren/gstsirendec.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 9046252958..1d40854d15 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -133,7 +133,7 @@ gst_video_aggregator_pad_set_property (GObject * object, guint prop_id, gst_object_unref (vagg); } -static gboolean +static GstFlowReturn _flush_pad (GstAggregatorPad * aggpad, GstAggregator * aggregator) { GstVideoAggregator *vagg = GST_VIDEO_AGGREGATOR (aggregator); @@ -144,7 +144,7 @@ _flush_pad (GstAggregatorPad * aggpad, GstAggregator * aggregator) pad->priv->start_time = -1; pad->priv->end_time = -1; - return TRUE; + return GST_FLOW_OK; } static gboolean diff --git a/gst/siren/gstsirendec.c b/gst/siren/gstsirendec.c index 93aadf0ad4..78338ae2bd 100644 --- a/gst/siren/gstsirendec.c +++ b/gst/siren/gstsirendec.c @@ -57,7 +57,7 @@ static gboolean gst_siren_dec_start (GstAudioDecoder * dec); static gboolean gst_siren_dec_stop (GstAudioDecoder * dec); static gboolean gst_siren_dec_set_format (GstAudioDecoder * dec, GstCaps * caps); -static gboolean gst_siren_dec_parse (GstAudioDecoder * dec, +static GstFlowReturn gst_siren_dec_parse (GstAudioDecoder * dec, GstAdapter * adapter, gint * offset, gint * length); static GstFlowReturn gst_siren_dec_handle_frame (GstAudioDecoder * dec, GstBuffer * buffer);