har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'

Browse Source 
* commit '5e87080f2c73186066df0b9c43877b4af0beef3a':
  h264_weight: Fix SSSE3 biweight code with weights of 128

Conflicts:
	libavcodec/x86/h264_weight.asm

See: e1009665759d4a3938dd2dd07b7e84d8bc9c5290
See: fb2288834ba8a51e8934cfe8b82ac468144a34df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-12 21:44:33 +02:00
commit b68b5ec513
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/x86/h264_weight.asm
View File

@ -136,9 +136,9 @@ WEIGHT_FUNC_HALF_MM 8, 8
or off_regd, 1 or off_regd, 1
add r4, 1 add r4, 1
cmp r6d, 128 cmp r6d, 128
je .nonnormal je .nonnormal
cmp r5, 128 cmp r5, 128
jne .normal jne .normal
.nonnormal .nonnormal
sar r5, 1 sar r5, 1
sar r6, 1 sar r6, 1