[FFmpeg-cvslog] swresample/rematrix_template: Fix integer overflow in mix6to2

Michael Niedermayer git at videolan.org
Mon Jun 10 03:03:47 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 10 02:39:48 2013 +0200| [b04bbe6b869581d572fe6b1dc351a2fd8e134cc1] | committer: Michael Niedermayer

swresample/rematrix_template: Fix integer overflow in mix6to2

Fixes: CID1030351
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b04bbe6b869581d572fe6b1dc351a2fd8e134cc1
---

 libswresample/rematrix_template.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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]);
     }



More information about the ffmpeg-cvslog mailing list