[FFmpeg-cvslog] resample2: Fix passing argument from incompatible pointer type warnings.

Michael Niedermayer git at videolan.org
Fri Oct 21 00:42:41 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 21 00:31:20 2011 +0200| [03e56a2ad932203987ba48678689cf1836a86337] | committer: Michael Niedermayer

resample2: Fix passing argument from incompatible pointer type warnings.

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

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

 libswresample/resample2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libswresample/resample2.c b/libswresample/resample2.c
index ac1610a..6af2b6c 100644
--- a/libswresample/resample2.c
+++ b/libswresample/resample2.c
@@ -344,7 +344,7 @@ int swr_multiple_resample(AVResampleContext *c, AudioData *dst, int dst_size, Au
     int i, ret= -1;
 
     for(i=0; i<dst->ch_count; i++){
-        ret= swr_resample(c, dst->ch[i], src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
+        ret= swr_resample(c, (short*)dst->ch[i], (const short*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
     }
 
     return ret;



More information about the ffmpeg-cvslog mailing list