Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 14:37:11 +0000 (15:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 14:37:11 +0000 (15:37 +0100)
commit60cc4a32b52fef453d03b3c60e1d661e3fad9c05
treec553bcd331c480fd3548e1c4d5b71137fad726e9
parent7b12554c5abca0eb63ddbdfdf6f11c76b9230a0c
parent215cdd35efd625ec28ef5846f1692b18f7c2c230
Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'

* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
  configure: Refactor dxva2api.h dependency declarations

Conflicts:
configure

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