diff options
author | Mark Thompson <sw@jkqxz.net> | 2017-03-30 21:18:23 +0100 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2017-03-30 21:18:23 +0100 |
commit | 546524056d7c26304cba855405e43b43dabe00d2 (patch) | |
tree | 80d7aabcd416b71f8351d7c4ffd7170e3a7efb11 /ffmpeg_vaapi.c | |
parent | 7cb082ac2ff0b0689d156ec5f3b54e73c0b6b744 (diff) | |
parent | 8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d (diff) | |
download | ffmpeg-546524056d7c26304cba855405e43b43dabe00d2.tar.gz |
Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'
* commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d':
hwcontext_qsv: transfer data through the child context when VPP fails
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'ffmpeg_vaapi.c')
0 files changed, 0 insertions, 0 deletions