From 3734d90ce63252e15a205975cc1cd5e1d523625c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 15 Apr 2016 20:46:37 +0100 Subject: [PATCH] a52dec, amrwbec: fix parse function declaration mismatch Fixes MSVC compiler warning: amrwbdec.c(99): warning C4133: '=': incompatible types - from 'gboolean (__cdecl *)(GstAudioDecoder *,GstAdapter *,gint *,gint *)' to 'GstFlowReturn (__cdecl *)(GstAudioDecoder *,GstAdapter *,gint *,gint *)' gsta52dec.c(156): warning C4133: '=': incompatible types - from 'gboolean (__cdecl *)(GstAudioDecoder *,GstAdapter *,gint *,gint *)' to 'GstFlowReturn (__cdecl *)(GstAudioDecoder *,GstAdapter *,gint *,gint *)' --- ext/a52dec/gsta52dec.c | 4 ++-- ext/amrwbdec/amrwbdec.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c index b84be76..a7b970c 100644 --- a/ext/a52dec/gsta52dec.c +++ b/ext/a52dec/gsta52dec.c @@ -97,8 +97,8 @@ G_DEFINE_TYPE (GstA52Dec, gst_a52dec, GST_TYPE_AUDIO_DECODER); static gboolean gst_a52dec_start (GstAudioDecoder * dec); static gboolean gst_a52dec_stop (GstAudioDecoder * dec); static gboolean gst_a52dec_set_format (GstAudioDecoder * bdec, GstCaps * caps); -static gboolean gst_a52dec_parse (GstAudioDecoder * dec, GstAdapter * adapter, - gint * offset, gint * length); +static GstFlowReturn gst_a52dec_parse (GstAudioDecoder * dec, + GstAdapter * adapter, gint * offset, gint * length); static GstFlowReturn gst_a52dec_handle_frame (GstAudioDecoder * dec, GstBuffer * buffer); diff --git a/ext/amrwbdec/amrwbdec.c b/ext/amrwbdec/amrwbdec.c index 811384f..f90b7b7 100644 --- a/ext/amrwbdec/amrwbdec.c +++ b/ext/amrwbdec/amrwbdec.c @@ -69,8 +69,8 @@ static const unsigned char block_size[16] = static gboolean gst_amrwbdec_start (GstAudioDecoder * dec); static gboolean gst_amrwbdec_stop (GstAudioDecoder * dec); static gboolean gst_amrwbdec_set_format (GstAudioDecoder * dec, GstCaps * caps); -static gboolean gst_amrwbdec_parse (GstAudioDecoder * dec, GstAdapter * adapter, - gint * offset, gint * length); +static GstFlowReturn gst_amrwbdec_parse (GstAudioDecoder * dec, + GstAdapter * adapter, gint * offset, gint * length); static GstFlowReturn gst_amrwbdec_handle_frame (GstAudioDecoder * dec, GstBuffer * buffer); -- 2.7.4