]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e23190269fb6e8217d080918893641ba3e0e3556'
authorMark Thompson <sw@jkqxz.net>
Tue, 16 Jan 2018 22:57:02 +0000 (22:57 +0000)
committerMark Thompson <sw@jkqxz.net>
Tue, 16 Jan 2018 22:57:02 +0000 (22:57 +0000)
* commit 'e23190269fb6e8217d080918893641ba3e0e3556':
  lavu/qsv: add log message for libmfx version

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

Simple merge