diff options
author | James Almer <jamrial@gmail.com> | 2018-09-11 14:02:58 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2018-09-11 14:02:58 -0300 |
commit | ee96ab2db507b95a694f10b152481cf71842de28 (patch) | |
tree | 5354b78b56fca5c2cedee74dfd36cf454dd2ed42 /libavformat/aiffenc.c | |
parent | a12063b118ad05409ff775ba30fab00265ad3031 (diff) | |
parent | 141c960e21d2860e354f9b90df136184dd00a9a8 (diff) | |
download | ffmpeg-ee96ab2db507b95a694f10b152481cf71842de28.tar.gz |
Merge commit '141c960e21d2860e354f9b90df136184dd00a9a8'
* commit '141c960e21d2860e354f9b90df136184dd00a9a8':
libfdk-aacenc: Fix building with libfdk-aac v2
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/aiffenc.c')
0 files changed, 0 insertions, 0 deletions