Patch by: Ian Caulfield, ian caulfield & gmx at

Originally committed as revision 9790 to svn://svn.ffmpeg.org/ffmpeg/trunk