Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:36:27 +0000 (15:36 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:36:27 +0000 (15:36 +0200)
commit4e6f2dbcd3ca0cee45a174ed8e50038810f7177b
treea59c7c8573fe4b41e809197c0e4fdd91b33d78e9
parent06a0e184359b75c3534bb88b08233efa53be8397
parent9f7590f4e497c12693247d7f935a20d7773a64dd
Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'

* commit '9f7590f4e497c12693247d7f935a20d7773a64dd':
  avconv_vaapi: use the hwcontext device creation API

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