Merge commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 15:39:41 +0000 (12:39 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 15:39:41 +0000 (12:39 -0300)
* commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb':
  x86: h264: Simplify DEQUANT macro with cpuflags

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

Simple merge