diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-21 00:31:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-21 00:31:20 +0200 |
| commit | 03e56a2ad932203987ba48678689cf1836a86337 (patch) | |
| tree | b165b544e9b79f4b8f03a5999e05e63cf031e42f /libswresample | |
| parent | e6459720b59073e98707f87243f5ee7bd7a3ecd7 (diff) | |
| download | ffmpeg-03e56a2ad932203987ba48678689cf1836a86337.tar.gz | |
resample2: Fix passing argument from incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/resample2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/resample2.c b/libswresample/resample2.c index ac1610aa26..6af2b6c661 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; |