Patch by Benoit Fouet (benoit.fouet AT purplelabs DOT com)

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