[FFmpeg-cvslog] Merge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Sep 28 00:06:42 2017 -0300| [2838ab65ccf5e3ceefe9819c1aee6edd7f3e4d90] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2838ab65ccf5e3ceefe9819c1aee6edd7f3e4d90
---