Changeset 8ea36711 in ffmpeg

Timestamp:

Mar 19, 2011, 7:05:11 PM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

05aa8c44

Parents:

43dc31f7 (diff), ec10a9ab (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> (03/19/11 19:02:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/19/11 19:05:11)

Message:

Merge remote-tracking branch 'newdev/master'

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

Not Pulled:

commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
Author: Mans Rullgard <​mans@mansr.com>
Date: Mon Feb 28 18:06:58 2011 +0000

Remove Sonic experimental audio codec

commit 2912e87a6c9264d556734e2bf94a99c64cf9b102
Author: Mans Rullgard <​mans@mansr.com>
Date: Fri Mar 18 17:35:10 2011 +0000

Replace FFmpeg with Libav in licence headers

(No files)