From 04b5eb47a653bc12bd33f1df2624450a80539997 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 2 Jul 2012 17:23:22 +0200 Subject: swr: fix mix* related function pointer warnings Signed-off-by: Michael Niedermayer --- libswresample/rematrix_template.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libswresample/rematrix_template.c') diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c index f83825d5ec..b3ed87e65f 100644 --- a/libswresample/rematrix_template.c +++ b/libswresample/rematrix_template.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +typedef void (RENAME(mix_any_func_type))(SAMPLE **out, const SAMPLE **in1, COEFF *coeffp, int len); static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEFF *coeffp, int index1, int index2, int len){ int i; @@ -55,7 +56,7 @@ static void RENAME(mix8to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, int } } -static mix_any_func_type *RENAME(get_mix_any_func)(SwrContext *s){ +static RENAME(mix_any_func_type) *RENAME(get_mix_any_func)(SwrContext *s){ if( s->out_ch_layout == AV_CH_LAYOUT_STEREO && (s->in_ch_layout == AV_CH_LAYOUT_5POINT1 || s->in_ch_layout == AV_CH_LAYOUT_5POINT1_BACK) && s->matrix[0][2] == s->matrix[1][2] && s->matrix[0][3] == s->matrix[1][3] && !s->matrix[0][1] && !s->matrix[0][5] && !s->matrix[1][0] && !s->matrix[1][4] -- cgit v1.2.1