]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '642fd4769becc2f4827f8375a3d9e8edd2f5df77'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:04:20 +0000 (14:04 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:04:20 +0000 (14:04 -0300)
* commit '642fd4769becc2f4827f8375a3d9e8edd2f5df77':
  qsvvpp: Perform full init only when needed

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavutil/hwcontext_qsv.c

Simple merge