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)
commit11f5ffd330053b5b4aee3830ada4e8820d5c17ac
tree955d6bf7d2bab1df61b3fb708c011d69f6ce69e4
parent53eea3a5693af41ccb281fccb5a37905f522b9ad
parente9bb77fb1012cba1951a82136df7071f71bce8fb
Merge commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb'

* commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb':
  x86: h264: Simplify DEQUANT macro with cpuflags

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