]> git.sesse.net Git - ffmpeg/commit
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)
commitfa4c3130ee1f3f9e2b86a14feaa11e720747bdf3
tree56ed1b3476d31c3650a0ec7e77ea0bed98ad47f8
parentd94a475c59e9ea871b7dc783acf6ccd5eca84339
parent7834a54c66d46471b246b411627efe2e8ef9dd47
Merge commit '7834a54c66d46471b246b411627efe2e8ef9dd47'

* commit '7834a54c66d46471b246b411627efe2e8ef9dd47':
  configure: enable vda hwaccel by default

Conflicts:
configure

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