Merge commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 10:39:54 +0000 (12:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 10:40:31 +0000 (12:40 +0200)
commit4a5074d7987e985645484c269e6f01faeec62da5
tree2c6ada8ffe22c695ed6cae7512366a862bbc0c35
parent2ecbf44f21c09f8f03bf142b6ce033d5da2cd731
parent84b223cc6d6ed4cc8bd295457a90f7c94a9dd784
Merge commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784'

* commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784':
  configure: Make the new qsv encoder depend on libmfx

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>