Michael Niedermayer 614cf1a613 Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91' ...

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

Conflicts:
	configure
	libavcodec/version.h

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

2013-08-21 12:05:19 +02:00

26 KiB

Raw Blame History

View Raw