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:57:16 +0200 |
| commit | 581bfd9c6f3a30a3859d2fc8b09f85ee0ccc1f25 (patch) | |
| tree | 19ac79c4537748d5c20a6413a193d9b1b21aa364 | |
| parent | 1218e9d73dc3ca8218ad56ce0e275116d499dd59 (diff) | |
| download | ffmpeg-581bfd9c6f3a30a3859d2fc8b09f85ee0ccc1f25.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 4759a063a6..f6b9d5f6ad 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 |