Merge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:06:42 +0000 (00:06 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:06:42 +0000 (00:06 -0300)
commit2838ab65ccf5e3ceefe9819c1aee6edd7f3e4d90
tree8a36be04fa47dab0b24e9bb0b5bcf201dad07377
parent752bc6b402ae3a20a7e01e6bdde483b081dffc81
parente791b915c774408fbc0ec9e7270b021899e08ccc
Merge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'

* commit 'e791b915c774408fbc0ec9e7270b021899e08ccc':
  hwcontext_vaapi: Try to support the VDPAU wrapper

This commit is a noop, see f2e4fb61af4b47c329fbf2b9a245594957d7bbab

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