From f78cd0c243b9149c7f604ecf1006d78e344aa6ca Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 14 Oct 2011 09:27:59 -0700 Subject: prores-idct: fix overflow in c code. Fix the fate ref for prores-422_proxy by reverting the changes to it in commit f492df0927c42da174edb674857670fc50abc5dc Signed-off-by: Janne Grunau --- libavcodec/simple_idct.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libavcodec/simple_idct.c') diff --git a/libavcodec/simple_idct.c b/libavcodec/simple_idct.c index c6cd9080df..0c75261079 100644 --- a/libavcodec/simple_idct.c +++ b/libavcodec/simple_idct.c @@ -108,7 +108,7 @@ void ff_simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block) /* IDCT8 on each line */ for(i=0; i<8; i++) { - idctRowCondDC_8(block + i*8); + idctRowCondDC_8(block + i*8, 0); } /* IDCT4 and store */ @@ -183,7 +183,7 @@ void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block) /* IDCT8 on each line */ for(i=0; i<4; i++) { - idctRowCondDC_8(block + i*8); + idctRowCondDC_8(block + i*8, 0); } /* IDCT4 and store */ @@ -230,10 +230,7 @@ void ff_prores_idct(DCTELEM *block, const int16_t *qmat) block[i] *= qmat[i]; for (i = 0; i < 8; i++) - idctRowCondDC_10(block + i*8); - - for (i = 0; i < 64; i++) - block[i] >>= 2; + idctRowCondDC_10(block + i*8, 2); for (i = 0; i < 8; i++) idctSparseCol_10(block + i); -- cgit v1.2.3