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)
* commit '307eb1a8ee363db1fcf869e427a8deb6d9538881':
  x86: vp8dsp: port FILTER_BILINEAR macro to cpuflags

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

Simple merge