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)
* commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d':
  hwcontext_qsv: transfer data through the child context when VPP fails

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

Simple merge