From 44a2bb75a72672177c3837512a2e1ea6f1143d66 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 21 Oct 2011 00:36:00 +0200
Subject: [PATCH] =?UTF-8?q?swr:=20Fix=20swresample.c:293:5:=20warning:=20p?=
=?UTF-8?q?assing=20argument=202=20of=20=E2=80=98fill=5Faudiodata=E2=80=99?=
=?UTF-8?q?=20from=20incompatible=20pointer=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libswresample/swresample.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index ad00fb3e2ac..a03d531d0f1 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -290,7 +290,7 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
out_count = in_count;
}
- fill_audiodata(in , in_arg);
+ fill_audiodata(in , (void*)in_arg);
fill_audiodata(out, out_arg);
if(s->full_convert){
--
GitLab