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)
* commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784':
  configure: Make the new qsv encoder depend on libmfx

Conflicts:
configure

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

No differences found