* 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>