Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:34:01 +0000 (15:34 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:34:01 +0000 (15:34 +0200)
commit85da4f92580d01cc67061ba90aca28d878868a80
tree166c81b7cc1eef0225b860361a33a93d042a4e12
parent844256740d27ee90621277b829afd0106fae8c4b
parent18c506e9e6e8df8b1d496d093077b8240ea68c28
Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'

* commit '18c506e9e6e8df8b1d496d093077b8240ea68c28':
  avconv_dxva2: use the hwcontext device creation API

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