diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 13:33:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 13:41:27 +0200 |
| commit | c2e2b29b73aa04b040300882e7be35aab9697fe2 (patch) | |
| tree | 649aa4a496a6249376793e5f52581e2ff127cef7 /ffmpeg_opt.c | |
| parent | a083543da03e9270c1677eca592e96a298cccb1d (diff) | |
| parent | 2f7065190ad48744014a02288799d03adfa613e0 (diff) | |
| download | ffmpeg-c2e2b29b73aa04b040300882e7be35aab9697fe2.tar.gz | |
Merge commit '2f7065190ad48744014a02288799d03adfa613e0'
* commit '2f7065190ad48744014a02288799d03adfa613e0':
libfdk-aac: Relicense the library wrappers to the ISC license
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions