Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:49:17 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:49:17 +0000 (13:49 +0100)
commitba4fba8f487380a0152b73ba6f9f5e5556322ae7
tree54852b218d42e3bd155961e72c966ac957626b49
parentdd72e26d0cea78093324bdc5c0088aa53f2983a2
parentd615187f74ddf3413778a8b5b7ae17255b0df88e
Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'

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

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/mpeg4audio.h