* commit 'd615187f':
  aacdec: Support for ER AAC ELD 480.

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