[FFmpeg-cvslog] avcodec/x86/h264_weight: handle weight1=128
Michael Niedermayer
git at videolan.org
Wed Jun 17 22:09:34 CEST 2015
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 9 05:11:09 2015 +0200| [4348a241ed535fe1141e4acfb3ad799b0302a8d2] | committer: Michael Niedermayer
avcodec/x86/h264_weight: handle weight1=128
Fix ticket4596
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e1009665759d4a3938dd2dd07b7e84d8bc9c5290)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4348a241ed535fe1141e4acfb3ad799b0302a8d2
---
libavcodec/x86/h264_weight.asm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm
index 4759a06..f6b9d5f 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
More information about the ffmpeg-cvslog
mailing list