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)
commitd59efe4ca63dca54ab0ca0f8be77c1b59c79227a
tree6c783c8b07562e9c79b77361899bc6b776c16036
parent460e7596cb5b1a449e50a7c3d2e6a5fff4a94c9a
parentb05128f3c953bd66483e697d60a2e7e45ee9cfa0
Merge commit 'b05128f3c953bd66483e697d60a2e7e45ee9cfa0'

* commit 'b05128f3c953bd66483e697d60a2e7e45ee9cfa0':
  qsv: Load the hw hevc plugin by default on Linux

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