[FFmpeg-cvslog] swr: fix warning: passing argument 1 of s-> mix_any_f from incompatible pointer type

Michael Niedermayer git at videolan.org
Mon Jul 2 17:37:59 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  2 17:32:23 2012 +0200| [338509c2e1f010bf6190797488c7afaf0969dfc8] | committer: Michael Niedermayer

swr: fix warning: passing argument 1 of s->mix_any_f from incompatible pointer type

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=338509c2e1f010bf6190797488c7afaf0969dfc8
---

 libswresample/swresample_internal.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index ddcecf1..52b60ce 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -26,7 +26,7 @@
 typedef void (mix_1_1_func_type)(void *out, const void *in, void *coeffp, int index, int len);
 typedef void (mix_2_1_func_type)(void *out, const void *in1, const void *in2, void *coeffp, int index1, int index2, int len);
 
-typedef void (mix_any_func_type)(void **out, const void **in1, void *coeffp, int len);
+typedef void (mix_any_func_type)(uint8_t **out, const uint8_t **in1, void *coeffp, int len);
 
 typedef struct AudioData{
     uint8_t *ch[SWR_CH_MAX];    ///< samples buffer per channel



More information about the ffmpeg-cvslog mailing list