Merge commit '136e7cf64ce9e78de7158d6720539d51cb96b743'
authorMark Thompson <sw@jkqxz.net>
Sat, 25 Nov 2017 14:38:03 +0000 (14:38 +0000)
committerMark Thompson <sw@jkqxz.net>
Sat, 25 Nov 2017 14:38:03 +0000 (14:38 +0000)
* commit '136e7cf64ce9e78de7158d6720539d51cb96b743':
  qsv/hevcdec: Load hw plugin by default on non-windows os

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

Simple merge