[SCM] ffmpeg/master: Merge branch 'upstream'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fe8e28bec16d0727def11525f573ba11d47cb3b0
X-Git-Newrev: 2c296e69fbefb1f34e8aadef74c6b58f47b7564f

The following commit has been merged in the master branch:
commit 211ecebed1426fbfa97008fef540a0458759f548
Merge: 31e3eeabd98909da8a808d7425751576323ea108 608587cad829e5182def255ca4ffb7e3652c3519
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 07:45:04 2011 +0200

    Merge branch 'upstream'


-- 
Libav/FFmpeg packaging