diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:02:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:02:43 +0200 |
| commit | fdb48225592c593892ffbe799847ff0867253d2a (patch) | |
| tree | ba0f9eb21885ef1f70670efe113c6c2f71882e0a /libavformat/amr.c | |
| parent | e0f291822306b544366faf408df4661c7acc300e (diff) | |
| parent | b3be41ca82529d60f90107d4e0d5b59daab00920 (diff) | |
| download | ffmpeg-fdb48225592c593892ffbe799847ff0867253d2a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions