Merge commit '5e87080f'

* commit '5e87080f': h264_weight: Fix SSSE3 biweight code with weights of 128 Conflicts: libavcodec/x86/h264_weight.asm See: e1009665 See: fb228883Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5e87080f'
* commit '5e87080f': h264_weight: Fix SSSE3 biweight code with weights of 128 Conflicts: libavcodec/x86/h264_weight.asm See: e1009665 See: fb228883Merged-by: Michael Niedermayer <michaelni@gmx.at>
b68b5ec5 · Michael Niedermayer · 85d0df0c · 5e87080f · b68b5ec5
Commit b68b5ec5 authored Jun 12, 2015 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

h264_weight.asm libavcodec/x86/h264_weight.asm +2 -2

No files found.
--- a/libavcodec/x86/h264_weight.asm
+++ b/libavcodec/x86/h264_weight.asm
@@ -136,9 +136,9 @@ WEIGHT_FUNC_HALF_MM 8, 8
    or   off_regd, 1
    add        r4, 1
    cmp        r6d, 128
-     je .nonnormal
+    je .nonnormal
    cmp        r5, 128
-     jne .normal
+    jne .normal
 .nonnormal
    sar        r5, 1
    sar        r6, 1