diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-21 00:28:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-21 00:28:03 +0200 |
| commit | 76dbb0905a033c5a6a2b9f353f62946ce3c9c788 (patch) | |
| tree | dc6ad13b04fe5964a993e37124f1268a0774348d /libswresample | |
| parent | 4aeaba4757620308a5b011aca65841c91b34c930 (diff) | |
| download | ffmpeg-76dbb0905a033c5a6a2b9f353f62946ce3c9c788.tar.gz | |
rematrix: Fix several passing argument from incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/rematrix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 17d6232a44..4a3ada62f4 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -236,20 +236,20 @@ int swr_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int must in_i= s->matrix_ch[out_i][1]; if(mustcopy || s->matrix[out_i][in_i]!=1.0){ if(s->int_sample_fmt == AV_SAMPLE_FMT_FLT){ - copy_float(out->ch[out_i], in->ch[in_i], s->matrix[out_i][in_i], len); + copy_float((float *)out->ch[out_i], (const float *)in->ch[in_i], s->matrix [out_i][in_i], len); }else - copy_s16 (out->ch[out_i], in->ch[in_i], s->matrix16[out_i][in_i], len); + copy_s16 ((int16_t*)out->ch[out_i], (const int16_t*)in->ch[in_i], s->matrix16[out_i][in_i], len); }else{ out->ch[out_i]= in->ch[in_i]; } break; case 2: if(s->int_sample_fmt == AV_SAMPLE_FMT_FLT){ - sum2_float(out->ch[out_i], in->ch[ s->matrix_ch[out_i][1] ], in->ch[ s->matrix_ch[out_i][2] ], + sum2_float((float *)out->ch[out_i], (const float *)in->ch[ s->matrix_ch[out_i][1] ], (const float *)in->ch[ s->matrix_ch[out_i][2] ], s->matrix[out_i][ s->matrix_ch[out_i][1] ], s->matrix[out_i][ s->matrix_ch[out_i][2] ], len); }else{ - sum2_s16 (out->ch[out_i], in->ch[ s->matrix_ch[out_i][1] ], in->ch[ s->matrix_ch[out_i][2] ], + sum2_s16 ((int16_t*)out->ch[out_i], (const int16_t*)in->ch[ s->matrix_ch[out_i][1] ], (const int16_t*)in->ch[ s->matrix_ch[out_i][2] ], s->matrix16[out_i][ s->matrix_ch[out_i][1] ], s->matrix16[out_i][ s->matrix_ch[out_i][2] ], len); } |