Commit 76dbb090 authored by Michael Niedermayer's avatar Michael Niedermayer

rematrix: Fix several passing argument from incompatible pointer type warnings.

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4aeaba47
...@@ -236,20 +236,20 @@ int swr_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int must ...@@ -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]; in_i= s->matrix_ch[out_i][1];
if(mustcopy || s->matrix[out_i][in_i]!=1.0){ if(mustcopy || s->matrix[out_i][in_i]!=1.0){
if(s->int_sample_fmt == AV_SAMPLE_FMT_FLT){ 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 }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{ }else{
out->ch[out_i]= in->ch[in_i]; out->ch[out_i]= in->ch[in_i];
} }
break; break;
case 2: case 2:
if(s->int_sample_fmt == AV_SAMPLE_FMT_FLT){ 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] ], s->matrix[out_i][ s->matrix_ch[out_i][1] ], s->matrix[out_i][ s->matrix_ch[out_i][2] ],
len); len);
}else{ }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] ], s->matrix16[out_i][ s->matrix_ch[out_i][1] ], s->matrix16[out_i][ s->matrix_ch[out_i][2] ],
len); len);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment