diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 16:13:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 16:18:15 +0200 |
| commit | ba040d4c8c1e9d55d12a6759bfa4932c11454da4 (patch) | |
| tree | e89e4e0698d5eba406228c637cb52bb7a1540129 /libavcodec/srtdec.c | |
| parent | db9c138616c9babc3a0f02c6b7289c774cc5b65c (diff) | |
| parent | 3828eb8519c1530392ab8820b1aa784602128afc (diff) | |
| download | ffmpeg-ba040d4c8c1e9d55d12a6759bfa4932c11454da4.tar.gz | |
Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'
* commit '3828eb8519c1530392ab8820b1aa784602128afc':
libfdk-aac: Relicense the library wrappers to 2-clause BSD
Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/libfdk-aacenc.c
<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.
Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/srtdec.c')
0 files changed, 0 insertions, 0 deletions