diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-04 14:53:58 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-04 15:12:11 +0200 |
commit | f3c638eac1e37127ab3ad1a5fa49bf39fb357dfa (patch) | |
tree | cbf5589ced2b5d95118620fd233a0bed7f297d09 /libswresample/rematrix_template.c | |
parent | 372e00793fe8b9a22cf9ebb8b1e1147db4ee4c6b (diff) | |
download | ffmpeg-f3c638eac1e37127ab3ad1a5fa49bf39fb357dfa.tar.gz |
wresample/rematrix_template: fix internal types
Should make no difference, but future commits will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/rematrix_template.c')
-rw-r--r-- | libswresample/rematrix_template.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c index b8ca901b65..ecdeab3460 100644 --- a/libswresample/rematrix_template.c +++ b/libswresample/rematrix_template.c @@ -42,8 +42,8 @@ typedef void (RENAME(mix_any_func_type))(SAMPLE **out, const SAMPLE **in1, COEFF static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEFF *coeffp, integer index1, integer index2, integer len){ int i; - COEFF coeff1 = coeffp[index1]; - COEFF coeff2 = coeffp[index2]; + INTER coeff1 = coeffp[index1]; + INTER coeff2 = coeffp[index2]; for(i=0; i<len; i++) out[i] = R(coeff1*in1[i] + coeff2*in2[i]); @@ -51,7 +51,7 @@ static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEF static void RENAME(copy)(SAMPLE *out, const SAMPLE *in, COEFF *coeffp, integer index, integer len){ int i; - COEFF coeff = coeffp[index]; + INTER coeff = coeffp[index]; for(i=0; i<len; i++) out[i] = R(coeff*in[i]); } @@ -61,8 +61,8 @@ static void RENAME(mix6to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, inte for(i=0; i<len; i++) { INTER t = in[2][i]*coeffp[0*6+2] + in[3][i]*coeffp[0*6+3]; - out[0][i] = R(t + in[0][i]*coeffp[0*6+0] + in[4][i]*coeffp[0*6+4]); - out[1][i] = R(t + in[1][i]*coeffp[1*6+1] + in[5][i]*coeffp[1*6+5]); + out[0][i] = R(t + in[0][i]*(INTER)coeffp[0*6+0] + in[4][i]*(INTER)coeffp[0*6+4]); + out[1][i] = R(t + in[1][i]*(INTER)coeffp[1*6+1] + in[5][i]*(INTER)coeffp[1*6+5]); } } @@ -71,8 +71,8 @@ static void RENAME(mix8to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, inte for(i=0; i<len; i++) { INTER t = in[2][i]*coeffp[0*8+2] + in[3][i]*coeffp[0*8+3]; - out[0][i] = R(t + in[0][i]*coeffp[0*8+0] + in[4][i]*coeffp[0*8+4] + in[6][i]*coeffp[0*8+6]); - out[1][i] = R(t + in[1][i]*coeffp[1*8+1] + in[5][i]*coeffp[1*8+5] + in[7][i]*coeffp[1*8+7]); + out[0][i] = R(t + in[0][i]*(INTER)coeffp[0*8+0] + in[4][i]*(INTER)coeffp[0*8+4] + in[6][i]*(INTER)coeffp[0*8+6]); + out[1][i] = R(t + in[1][i]*(INTER)coeffp[1*8+1] + in[5][i]*(INTER)coeffp[1*8+5] + in[7][i]*(INTER)coeffp[1*8+7]); } } |