diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-11 14:13:28 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-11 14:13:28 -0300 |
| commit | c7488f746154b5dcd70f8a3bef9a9fa5c42ac595 (patch) | |
| tree | 00f87888230f0dbabe75adac611f680db95969ae /libavformat/tcp.c | |
| parent | 94d98330ed6c5562341315c26c1af92771a2e6de (diff) | |
| parent | 7e929dac100916fc45cb95e231025f3439c20156 (diff) | |
| download | ffmpeg-c7488f746154b5dcd70f8a3bef9a9fa5c42ac595.tar.gz | |
Merge commit '7e929dac100916fc45cb95e231025f3439c20156'
* commit '7e929dac100916fc45cb95e231025f3439c20156':
libfdk-aacenc: Allow enabling the ELDv2 profile
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions