diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 05:11:09 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-06-19 11:25:38 +0200 |
| commit | ff02eeafd8b36d15a4b1331a41899a17cc5f94e5 (patch) | |
| tree | 67103e921eb376d8ffcc1a6aa98e9459d19c9523 | |
| parent | bd28de1b4df5022a88ac0df95c241145d4bb3292 (diff) | |
| download | ffmpeg-ff02eeafd8b36d15a4b1331a41899a17cc5f94e5.tar.gz | |
avcodec/x86/h264_weight: handle weight1=128
Fix ticket4596
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e1009665759d4a3938dd2dd07b7e84d8bc9c5290)
| -rw-r--r-- | libavcodec/x86/h264_weight.asm | 3 |
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 |