aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-09 05:11:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-09 05:11:09 +0200
commite1009665759d4a3938dd2dd07b7e84d8bc9c5290 (patch)
tree452ac80f355d5bad715e525f61498f0c2d5fa1e7
parent7c9fcdfabd4c8d37d8e588b39e7786cf55ed5989 (diff)
downloadffmpeg-e1009665759d4a3938dd2dd07b7e84d8bc9c5290.tar.gz
avcodec/x86/h264_weight: handle weight1=128
Fix ticket4596 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/h264_weight.asm3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm
index b4fb9db309..1e1219ddde 100644
--- a/libavcodec/x86/h264_weight.asm
+++ b/libavcodec/x86/h264_weight.asm
@@ -135,8 +135,11 @@ WEIGHT_FUNC_HALF_MM 8, 8
add off_regd, 1
or off_regd, 1
add r4, 1
+ cmp r6d, 128
+ je .nonnormal
cmp r5, 128
jne .normal
+.nonnormal
sar r5, 1
sar r6, 1
sar off_regd, 1