mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
avcodec/proresenc_anatoliy: Fix invalid left shift of negative number
This fixes ticket #7997 as well as the vsynth*-prores_# FATE-tests (where * ranges over { 1, 2, 3, _lena } and # over { , _int, _444, _444_int }). (Given that prev_dc is in the range -0xC000..0x3FFF, no overflow can happen upon multiplication with 2.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
2dc2b11fba
commit
198081efb7
@ -224,7 +224,7 @@ static void encode_codeword(PutBitContext *pb, int val, int codebook)
|
||||
}
|
||||
|
||||
#define QSCALE(qmat,ind,val) ((val) / ((qmat)[ind]))
|
||||
#define TO_GOLOMB(val) (((val) << 1) ^ ((val) >> 31))
|
||||
#define TO_GOLOMB(val) (((val) * 2) ^ ((val) >> 31))
|
||||
#define DIFF_SIGN(val, sign) (((val) >> 31) ^ (sign))
|
||||
#define IS_NEGATIVE(val) ((((val) >> 31) ^ -1) + 1)
|
||||
#define TO_GOLOMB2(val,sign) ((val)==0 ? 0 : ((val) << 1) + (sign))
|
||||
|
Loading…
Reference in New Issue
Block a user