* commit '0ee25733':
  aacdec: Support for ER AAC in LATM

Conflicts:
	libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>