Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 10:55:26 +0000 (12:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 10:55:26 +0000 (12:55 +0200)
commit32ea39f56d90585c63eedfcb631e0a939fc1f95e
treefc23e9cf250c9b2b9b05f617d1513d5386b4de78
parent257f11820bdf628648466ce07ee0bf67217b543e
parent1914e6f010b3320025c7b692aaea51d9b9a992a8
Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'

* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8':
  aacdec: Add support for LD (Low Delay) AAC

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