aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-21 00:36:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-21 00:36:00 +0200
commit44a2bb75a72672177c3837512a2e1ea6f1143d66 (patch)
tree1cfccd438ff186af94f27ca409f710ee8faa3c54
parent36e5e51ae3faa1589d6ae097b155d848eabb004c (diff)
downloadffmpeg-44a2bb75a72672177c3837512a2e1ea6f1143d66.tar.gz
swr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswresample/swresample.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index ad00fb3e2a..a03d531d0f 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){