diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 12:10:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 00:21:49 +0200 |
| commit | cab8d31804ed1218a7801f65b892a6c0440cf7e3 (patch) | |
| tree | 814c5a71a38b55d03d9f11684abfbc7f7a919f94 | |
| parent | 3585986a005af3c400b3b7e09123a71824a31bc8 (diff) | |
| download | ffmpeg-cab8d31804ed1218a7801f65b892a6c0440cf7e3.tar.gz | |
avcodec/fic: Fix multiple left shift of negative value -15
Fixes: 1356/clusterfuzz-testcase-minimized-6008489086287872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b20c71409b24460983ba5d9afa0716714f9e0f7d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/fic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/fic.c b/libavcodec/fic.c index 2bec3d7b03..3805f70722 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -95,8 +95,8 @@ static av_always_inline void fic_idct(int16_t *blk, int step, int shift, int rnd const int t7 = t3 - t1; const int t8 = 17734 * blk[2 * step] - 42813 * blk[6 * step]; const int t9 = 17734 * blk[6 * step] + 42814 * blk[2 * step]; - const int tA = (blk[0 * step] - blk[4 * step] << 15) + rnd; - const int tB = (blk[0 * step] + blk[4 * step] << 15) + rnd; + const int tA = (blk[0 * step] - blk[4 * step]) * 32768 + rnd; + const int tB = (blk[0 * step] + blk[4 * step]) * 32768 + rnd; blk[0 * step] = ( t4 + t9 + tB) >> shift; blk[1 * step] = ( t6 + t7 + t8 + tA) >> shift; blk[2 * step] = ( t6 - t7 - t8 + tA) >> shift; |