Michael Niedermayer fdb4822559 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).

Conflicts:
	Changelog
	libavcodec/aacdec.c
	libavcodec/version.h

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

2013-10-23 10:02:43 +02:00

11 KiB

Raw Blame History

View Raw