[SCM] ffmpeg/master: Merge branch 'master' into master.snapshot

[Reinhard Tartler]

On Fri, Jan 28, 2011 at 23:18:19 (CET), siretart at users.alioth.debian.org wrote:
> The following commit has been merged in the master branch:
> commit 88a8b9a072d47905142eefc24dc3c90a210167bd
> Merge: cb49ef8e70c9e3a1c084dfc33aef27c1ff91e974 d70e0b63233c5dc9d4ffa4d2481a67b9543ab5b0
> Author: Reinhard Tartler <siretart at tauware.de>
> Date:   Fri Jan 28 22:58:26 2011 +0100
>
>     Merge branch 'master' into master.snapshot

FYI what happened:

I've now prepared an upload to *unstable* in git, but this is obviously
not going into squeeze. I want to upload it shortly after squeeze is
released, maybe even during the time when the upload processor is
suspended for the release. If you have some further changes that should
go in, this week would be an excellent time.

I'll attend FOSDEM this year, and can probably be found at the
BeagleBoard booth, as the other FFmpeg guys will be there as well.

(Hopefully) see you at FOSDEM!

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4