ffmpeg | branch: release/2.6 | Michael Niedermayer <michae...@gmx.at> | Tue Jun 9 05:11:09 2015 +0200| [a6bdfd9b46bb9bc10c9715f8f87977a391676b2b] | committer: Carl Eugen Hoyos
avcodec/x86/h264_weight: handle weight1=128 Fix ticket4596 Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit e1009665759d4a3938dd2dd07b7e84d8bc9c5290) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6bdfd9b46bb9bc10c9715f8f87977a391676b2b --- 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 b4fb9db..1e1219d 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
