Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 17:14:40 +0000 (19:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 17:31:22 +0000 (19:31 +0200)
commit2a339720309352cd685237dd809d1ad2bb1369f1
treeaacd7b36fd345d955454598d282f5c9fe98a644c
parentf939bf58b22896fadfcfadaddb9c222a86e7ecfa
parentfd11465b21ac90bf6964b0c0ca9d6ba64cd3291d
Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'

* commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d':
  configure: Use pkg-config for fdk-aac

Conflicts:
configure

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