Merge commit '8d1267932ca9c2e343ef303349101bab6681d02e'
authorJames Almer <jamrial@gmail.com>
Tue, 21 Mar 2017 19:10:33 +0000 (16:10 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 21 Mar 2017 19:10:33 +0000 (16:10 -0300)
commit387d96fcf54bb8361195fe8ac2c6688d35d5313f
tree8cd8e0e41a94193b8aa99060ea0910f79028f4af
parent9a0fbb9ca9256a2d081e440025b12f390d7380df
parent8d1267932ca9c2e343ef303349101bab6681d02e
Merge commit '8d1267932ca9c2e343ef303349101bab6681d02e'

* commit '8d1267932ca9c2e343ef303349101bab6681d02e':
  x86/h264_weight: use appropriate register size for weight parameters

This commit is a noop, see 5ae0ad001a653e71b14c92a0d7861de87901752c

Merged-by: James Almer <jamrial@gmail.com>