Merge commit 'b05128f3c953bd66483e697d60a2e7e45ee9cfa0'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 16:58:32 +0000 (13:58 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 16:58:32 +0000 (13:58 -0300)
* commit 'b05128f3c953bd66483e697d60a2e7e45ee9cfa0':
  qsv: Load the hw hevc plugin by default on Linux

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

Simple merge