Skip to content
Snippets Groups Projects
Commit b68b5ec5 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '5e87080f' 


* commit '5e87080f':
  h264_weight: Fix SSSE3 biweight code with weights of 128

Conflicts:
	libavcodec/x86/h264_weight.asm

See: e1009665
See: fb228883
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 85d0df0c 5e87080f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment