Patch by Nicolas George (nicolas george normalesup org)

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