Merge commit '02c2761973dfc886e94a60a9c7d6d30c296d5b8c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:26:53 +0000 (17:26 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:26:53 +0000 (17:26 +0100)
commit93cd6dd488593116359c78395deef8414dfca799
treee8558c0eb7eaeefc367a80dcea27ba3f7a381bef
parent4945343606ec3a2d94c0ac5891c685997f6b43e9
parent02c2761973dfc886e94a60a9c7d6d30c296d5b8c
Merge commit '02c2761973dfc886e94a60a9c7d6d30c296d5b8c'

* commit '02c2761973dfc886e94a60a9c7d6d30c296d5b8c':
  avconv_qsv: use the device creation API

Not merged, our ffmpeg hwaccel infra is not quite the same as avconvs.

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