Merge commit '7640c4a371a97899dfb443d980fd0bf8ac587754'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:40:20 +0000 (13:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:40:23 +0000 (13:40 +0100)
* commit '7640c4a371a97899dfb443d980fd0bf8ac587754':
  aacdec: Tables for length 480 AAC ELD.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacdec.c
libavcodec/aactab.c
libavcodec/aactab.h

Simple merge
Simple merge
Simple merge