]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '582d4211e00015b68626f77ce4af53161e2b1713'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:16:56 +0000 (15:16 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:16:56 +0000 (15:16 +0100)
* commit '582d4211e00015b68626f77ce4af53161e2b1713':
  vf_scale_vaapi: Respect driver quirks around buffer destruction

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

Trivial merge