[FFmpeg-cvslog] Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 11:45:03 2013 +0200| [614cf1a6133a143961798c5d87c9bffc2ca0da9e] | committer: Michael Niedermayer

Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'

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

Conflicts:
	configure
	libavcodec/version.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=614cf1a6133a143961798c5d87c9bffc2ca0da9e
---