Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 14:45:45 +0000 (15:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 15:18:21 +0000 (16:18 +0100)
commit8cf9253aef19e0ef4523be253a8fa8853179cfb0
tree9edbec06e1651dd918fc1c10c55b3e82e9bfb293
parent60cc4a32b52fef453d03b3c60e1d661e3fad9c05
parent82ca17ac7a0a08784cb6808384ee237ac28e8334
Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'

* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
  configure: Fix vaapi/vda/vdpau dependency declarations

Conflicts:
configure

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