mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'
* commit '5e87080f2c73186066df0b9c43877b4af0beef3a': h264_weight: Fix SSSE3 biweight code with weights of 128 Conflicts: libavcodec/x86/h264_weight.asm See:e100966575
See:fb2288834b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b68b5ec513
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue