Revision 8ea36711

« Previous | Next »

Added by Michael Niedermayer over 9 years ago

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 &lt;mans@mansr.com&gt;
    Date:   Fri Mar 18 17:35:10 2011 +0000

Replace FFmpeg with Libav in licence headers