Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 22 Jun 2016 21:36:37 +0000 (23:36 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 22 Jun 2016 21:36:37 +0000 (23:36 +0200)
commite799e2270cb899c991866894c64893012f2d7adb
tree6844d710c0325147469cbdc6dbf0edb8cd2b11f8
parent0c312a45629f195a73cb3430d8ba0b8388f29da1
parentb23613268c6b56a8f9de7859562d82b4b88353d9
Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'

* commit 'b23613268c6b56a8f9de7859562d82b4b88353d9':
  avconv_dxva2: use the hwcontext API

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