Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:29:39 +0000 (15:29 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:29:39 +0000 (15:29 +0200)
commit844256740d27ee90621277b829afd0106fae8c4b
tree7e4b02f3193b2f964fde331b6138487b995a7620
parented5d03ff6f900470eb74e86e4b59a08b6727f5f4
parentf72db3f2f3a8c83a4f5dede8fa03434b2bf676c6
Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'

* commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6':
  avconv_vdpau: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg_vdpau.c