Merge commit '35ed7f93dbc72d733e454ae464b1324f38af62a0'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:10:49 +0000 (19:10 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:10:49 +0000 (19:10 -0300)
commitb4ca32414ea28ad29b4bd387c298f5a676dace2a
tree87b807ded61bb56e9eb08cd805f56369b412bc65
parentfb4a12cda4033f2f3d3d1039739f6e0e6f9afb82
parent35ed7f93dbc72d733e454ae464b1324f38af62a0
Merge commit '35ed7f93dbc72d733e454ae464b1324f38af62a0'

* commit '35ed7f93dbc72d733e454ae464b1324f38af62a0':
  qsvenc: Add an option to disable MFE mode

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