diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-18 09:05:54 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-18 09:05:54 +0200 |
| commit | 4cf4831ae7e2b6ccbea9c2d65605a3722aeac9c2 (patch) | |
| tree | fc30426dbe9c0f6c4a5a55e48659f136f0789e10 /libavutil/replaygain.h | |
| parent | 9dc30d08114068ccfe65e89c3c46deee3e6a2289 (diff) | |
| parent | 1b90433f79de857550d4d8c35c89fbe954920594 (diff) | |
| download | ffmpeg-4cf4831ae7e2b6ccbea9c2d65605a3722aeac9c2.tar.gz | |
Merge commit '1b90433f79de857550d4d8c35c89fbe954920594'
* commit '1b90433f79de857550d4d8c35c89fbe954920594':
libfdk-aacdec: Always decode into an intermediate buffer
Conflicts:
libavcodec/libfdk-aacdec.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/replaygain.h')
0 files changed, 0 insertions, 0 deletions