Merge commit '8fd8f91e47f33cd82371a97ac81afc476144964f'
authorJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 21:30:31 +0000 (18:30 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 21:30:31 +0000 (18:30 -0300)
commit49fe0ecd405ddcee8840a98b3f09f0efe41b233d
tree9fc9118bc3d30239bb043266e9bb99f3e31dd879
parentf568d9d0baffb4c3c82a806a6aade464a92052aa
parent8fd8f91e47f33cd82371a97ac81afc476144964f
Merge commit '8fd8f91e47f33cd82371a97ac81afc476144964f'

* commit '8fd8f91e47f33cd82371a97ac81afc476144964f':
  qsvenc: Make sure the interlaced encoding works
  qsvenc: Use MFXVideoENCODE_Query() to update the parameters

This commit is a noop, see
dd8319767e1674d030b5d803c43029e67db5efb8
ae5b67ee64bec00c52881ff8426fddaf477341c1

Merged-by: James Almer <jamrial@gmail.com>