Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'
authorMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 20:18:23 +0000 (21:18 +0100)
committerMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 20:18:23 +0000 (21:18 +0100)
commit546524056d7c26304cba855405e43b43dabe00d2
tree80d7aabcd416b71f8351d7c4ffd7170e3a7efb11
parent7cb082ac2ff0b0689d156ec5f3b54e73c0b6b744
parent8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d
Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'

* commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d':
  hwcontext_qsv: transfer data through the child context when VPP fails

Merged-by: Mark Thompson <sw@jkqxz.net>
libavutil/hwcontext_qsv.c