diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:49:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:49:17 +0100 |
| commit | ba4fba8f487380a0152b73ba6f9f5e5556322ae7 (patch) | |
| tree | 54852b218d42e3bd155961e72c966ac957626b49 /libswresample/audioconvert.c | |
| parent | dd72e26d0cea78093324bdc5c0088aa53f2983a2 (diff) | |
| parent | d615187f74ddf3413778a8b5b7ae17255b0df88e (diff) | |
| download | ffmpeg-ba4fba8f487380a0152b73ba6f9f5e5556322ae7.tar.gz | |
Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'
* commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e':
aacdec: Support for ER AAC ELD 480.
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/audioconvert.c')
0 files changed, 0 insertions, 0 deletions