diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-10-14 09:27:59 -0700 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-10-14 21:34:20 +0200 |
| commit | f78cd0c243b9149c7f604ecf1006d78e344aa6ca (patch) | |
| tree | 69541ec6cea2ec6d84166fa91326474e96eca21b /libavcodec/simple_idct.c | |
| parent | 8aa80ec5e30ea8a3214cc7371ffbcf3ae3121113 (diff) | |
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 <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/simple_idct.c')
| -rw-r--r-- | libavcodec/simple_idct.c | 9 |
1 files changed, 3 insertions, 6 deletions
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); |