Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 09:45:03 +0000 (11:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:05:19 +0000 (12:05 +0200)
commit614cf1a6133a143961798c5d87c9bffc2ca0da9e
treebd72a843fa20e50578e1c8a8231262150136b322
parentb69b075ac607419a840da798b089de8ea7630d4b
parent4f2b469da5e4ae221718ae479f6af627cfdebb91
Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'

* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
  Add a libfdk-aac decoder

Conflicts:
configure
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libfdk-aacdec.c
libavcodec/version.h