Patch by Thilo Borgmann name.surname AT googlemail.com. Originally committed as revision 18409 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 18259 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 18216 to svn://svn.ffmpeg.org/ffmpeg/trunk