Merge commit '307eb1a8ee363db1fcf869e427a8deb6d9538881'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 15:28:39 +0000 (12:28 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 15:28:39 +0000 (12:28 -0300)
commit53eea3a5693af41ccb281fccb5a37905f522b9ad
treeb720d9a363067e5fc0e7ce5c4842ecc9a062fe17
parent2904db90458a1253e4aea6844ba9a59ac11923b6
parent307eb1a8ee363db1fcf869e427a8deb6d9538881
Merge commit '307eb1a8ee363db1fcf869e427a8deb6d9538881'

* commit '307eb1a8ee363db1fcf869e427a8deb6d9538881':
  x86: vp8dsp: port FILTER_BILINEAR macro to cpuflags

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/x86/vp8dsp.asm