Patch by: Ian Caulfield, ian caulfield & gmx at Originally committed as revision 9790 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 8910 to svn://svn.ffmpeg.org/ffmpeg/trunk