Based on patches by James Darnley <james dot darnley at gmail dot com>.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23554 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b