Merge branch 'master' of git.videolan.org:ffmpeg
authorCompn <tempn@twmi.rr.com>
Tue, 17 May 2011 03:31:23 +0000 (23:31 -0400)
committerCompn <tempn@twmi.rr.com>
Tue, 17 May 2011 03:31:23 +0000 (23:31 -0400)

Trivial merge