Patch by Matthieu Castet castet matthieu free fr

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