Changeset ba040d4c in ffmpeg

Timestamp:

May 5, 2014, 2:18:15 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

47550e62

Parents:

db9c1386 (diff), 3828eb85 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/05/14 14:13:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/05/14 14:18:15)

Message:

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>

(No files)