Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:44:33 +0000 (21:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:47:01 +0000 (21:47 +0200)
* 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>
1  2 
libavcodec/x86/h264_weight.asm

Simple merge