diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-04 12:47:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-04 13:37:00 +0100 |
| commit | 18268f761bffb37552f59f87542fef3d5c80618c (patch) | |
| tree | 88034fff543294b9839d7ae2883574fb84f0e232 | |
| parent | d89c4846e0d6caee595023657040f351f1ef3fc4 (diff) | |
| download | ffmpeg-18268f761bffb37552f59f87542fef3d5c80618c.tar.gz | |
avcodec/vp3: Fix "runtime error: left shift of negative value"
Fixes: 5c6129154b356b80bcab86f9e3ee5d29/signal_sigabrt_7ffff6ae7cc9_7322_d26ac6d7cb6567db1b8be0159b387d0b.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vp3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index a478a1b0a3..5bbf47b52d 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -209,8 +209,8 @@ typedef struct Vp3DecodeContext { int16_t *dct_tokens[3][64]; int16_t *dct_tokens_base; #define TOKEN_EOB(eob_run) ((eob_run) << 2) -#define TOKEN_ZERO_RUN(coeff, zero_run) (((coeff) << 9) + ((zero_run) << 2) + 1) -#define TOKEN_COEFF(coeff) (((coeff) << 2) + 2) +#define TOKEN_ZERO_RUN(coeff, zero_run) (((coeff) * 512) + ((zero_run) << 2) + 1) +#define TOKEN_COEFF(coeff) (((coeff) * 4) + 2) /** * number of blocks that contain DCT coefficients at |