[FFmpeg-cvslog] Merge remote-tracking branch 'newdev/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 19 20:02:42 2011 +0100| [8ea36711b0a85e24a77e1c76b1cb24aa63df217f] | committer: Michael Niedermayer

Merge remote-tracking branch 'newdev/master'

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

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

        Remove Sonic experimental audio codec

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

        Replace FFmpeg with Libav in licence headers

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ea36711b0a85e24a77e1c76b1cb24aa63df217f
---