diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-08-22 06:16:31 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-08-22 06:16:31 +0100 |
| commit | e8279880dcf7bed02cc1630f1e1582837f7e5eea (patch) | |
| tree | ee597eecd94aeec2290b9bb0d3569777350cf20a /libavcodec/aacenc_is.c | |
| parent | 21dd5279c3c48aec82fe566744b4a3fb4f729c60 (diff) | |
| download | ffmpeg-e8279880dcf7bed02cc1630f1e1582837f7e5eea.tar.gz | |
acenctab: Fix merge conflict
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec/aacenc_is.c')
0 files changed, 0 insertions, 0 deletions