Changeset c2e2b29b in ffmpeg

Timestamp:

Jun 6, 2014, 11:41:27 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

adf4ee4

Parents:

a083543d (diff), 2f70651 (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> (06/06/14 11:33:14)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/06/14 11:41:27)

Message:

Merge commit '2f7065190ad48744014a02288799d03adfa613e0'

• commit '2f7065190ad48744014a02288799d03adfa613e0': libfdk-aac: Relicense the library wrappers to the ISC license

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)