Merge commit '2017ffc18fe4d33b954dd8a50b086f310f17a329'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 16:21:21 +0000 (13:21 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 16:21:21 +0000 (13:21 -0300)
commitc2e3cfd060a310e46c7dda4d5ab56479a718e7c3
treed98f43fbe3a67b961fc2ef1a794bc1b877cf14f9
parent092951f4a862afad0614841af8144a40a6b2f5f5
parent2017ffc18fe4d33b954dd8a50b086f310f17a329
Merge commit '2017ffc18fe4d33b954dd8a50b086f310f17a329'

* commit '2017ffc18fe4d33b954dd8a50b086f310f17a329':
  vaapi: Add ABGR map only if VA_FOURCC_ABGR is defined

This commit is a noop, see 5aede051202150a1904c0f07a5c7901f402395a5

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