Merge commit '7834a54c66d46471b246b411627efe2e8ef9dd47'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:20:01 +0000 (23:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:20:47 +0000 (23:20 +0100)
* commit '7834a54c66d46471b246b411627efe2e8ef9dd47':
  configure: enable vda hwaccel by default

Conflicts:
configure

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

Trivial merge