Patch by Laurent Aimar fenrir \:/ via ecp fr

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