Patch by Rafaël Carré (rafael <dot> carre <at> gmail).

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