summaryrefslogtreecommitdiff
path: root/libavcodec/cabac_functions.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-27 12:11:29 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-27 13:52:47 +0100
commita1f6b05f5228979dab0e149deca7a30d22e98af5 (patch)
tree83ce8b52eff8fbf8226c196c94053628dba30788 /libavcodec/cabac_functions.h
parent96786a12f6df26990bbe7c0ca4592b3731724469 (diff)
downloadffmpeg-a1f6b05f5228979dab0e149deca7a30d22e98af5.tar.gz
avcodec/cabac_functions: Fix "left shift of negative value -31767"
Fixes: 1430e9c43fae47a24c179c7c54f94918/signal_sigsegv_421427_2340_591e9810c7b09efe501ad84638c9e9f8.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Found-by: xiedingbao (Ticket4727) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/cabac_functions.h')
-rw-r--r--libavcodec/cabac_functions.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h
index bcd1dee972..4ded8ebd58 100644
--- a/libavcodec/cabac_functions.h
+++ b/libavcodec/cabac_functions.h
@@ -74,7 +74,8 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){
#ifndef get_cabac_inline
static void refill2(CABACContext *c){
- int i, x;
+ int i;
+ unsigned x;
x= c->low ^ (c->low-1);
i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS-1)];