Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 08:02:43 +0000 (10:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 08:02:43 +0000 (10:02 +0200)
commitfdb48225592c593892ffbe799847ff0867253d2a
treeba0f9eb21885ef1f70670efe113c6c2f71882e0a
parente0f291822306b544366faf408df4661c7acc300e
parentb3be41ca82529d60f90107d4e0d5b59daab00920
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>
Changelog
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/aactab.c
libavcodec/aactab.h
libavcodec/version.h