Merge commit '28396d17ff1c1493b78d6eece484ffc27ed86d0d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Nov 2014 10:38:30 +0000 (11:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Nov 2014 10:38:49 +0000 (11:38 +0100)
* commit '28396d17ff1c1493b78d6eece484ffc27ed86d0d':
  libfdk-aacdec: Support building with the latest version of fdk-aac

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

Trivial merge