Merge commit '4ce701b4e640d4723a4005d664f31f8342fac40e'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:12:52 +0000 (19:12 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:12:52 +0000 (19:12 -0300)
commit8e789d244cc946bc350672eeb02453918b21a09f
tree8bacb14f062bd95e89f51cd1dbaff7ff839aa20c
parentaebc5b2284db1f40a5b3e2e9a2bf406f606436c7
parent4ce701b4e640d4723a4005d664f31f8342fac40e
Merge commit '4ce701b4e640d4723a4005d664f31f8342fac40e'

* commit '4ce701b4e640d4723a4005d664f31f8342fac40e':
  qsvenc: remove vcm option on Linux

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