Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:16 +0000 (21:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:19 +0000 (21:12 +0100)
commitac649bb775b9635db6810cb200ef81a777368e4a
tree05011139598044ec9a794b4b60014471d7fa3cc2
parent841e9f431cf4b1be0b5c3932c289d405f34dfcc2
parent11c22dfd495bbd3f38df639772aa4bb9a1be882d
Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'

* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
  configure: add missing h264_qsv hwaccel deps

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