based on a patch by David Geldreich, david.geldreich free fr

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