diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:31:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:31:24 +0100 |
| commit | f53aa3f4f331d845b76c336405435b76dc7204f9 (patch) | |
| tree | eb78153cb538fc7bbb7b0acbb03efc618f3a942b /libswresample/dither_template.c | |
| parent | 5348d7b605c0188852e6729c6dbc22afae590a73 (diff) | |
| parent | 0ee2573347ecdb9cb5656001f7201d819eec16d8 (diff) | |
| download | ffmpeg-f53aa3f4f331d845b76c336405435b76dc7204f9.tar.gz | |
Merge commit '0ee2573347ecdb9cb5656001f7201d819eec16d8'
* commit '0ee2573347ecdb9cb5656001f7201d819eec16d8':
aacdec: Support for ER AAC in LATM
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/dither_template.c')
0 files changed, 0 insertions, 0 deletions