]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '4926fa9a4aa03f3b751f52e900b9efb87fea0591'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:16:31 +0000 (15:16 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:16:31 +0000 (15:16 +0100)
* commit '4926fa9a4aa03f3b751f52e900b9efb87fea0591':
  hwcontext_vaapi: Add driver quirks to the hwdevice

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

Trivial merge