summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-06-10 00:39:48 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-06-10 01:03:12 (GMT)
commitb04bbe6b869581d572fe6b1dc351a2fd8e134cc1 (patch)
tree53fb60c6d6c8a5ade1e08315fa7d47f7068ff901
parent052838f765fbcb1ca77703d50dc0b29e72d839f6 (diff)
downloadffmpeg-b04bbe6b869581d572fe6b1dc351a2fd8e134cc1.zip
ffmpeg-b04bbe6b869581d572fe6b1dc351a2fd8e134cc1.tar.gz
ffmpeg-b04bbe6b869581d572fe6b1dc351a2fd8e134cc1.tar.bz2
swresample/rematrix_template: Fix integer overflow in mix6to2
Fixes: CID1030351 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libswresample/rematrix_template.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c
index 214d905..6e7e686 100644
--- a/libswresample/rematrix_template.c
+++ b/libswresample/rematrix_template.c
@@ -66,7 +66,7 @@ static void RENAME(mix6to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, inte
int i;
for(i=0; i<len; i++) {
- INTER t = in[2][i]*coeffp[0*6+2] + in[3][i]*coeffp[0*6+3];
+ INTER t = in[2][i]*(INTER)coeffp[0*6+2] + in[3][i]*(INTER)coeffp[0*6+3];
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]);
}