Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'
authorMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 20:16:58 +0000 (21:16 +0100)
committerMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 20:16:58 +0000 (21:16 +0100)
commit7cb082ac2ff0b0689d156ec5f3b54e73c0b6b744
treecb199c81984a4308358d1977d7852a84840706cb
parent59b1942aae47ce56511a3e11e99a5d42d6becfe2
parentb91ce4860054430d3712deb0d9487cac2fcb7d68
Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'

* commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68':
  hwcontext_qsv: do not fail when download/upload VPP session creation fails

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