Patch by Gwenole Beauchesne <g$lastname> <at> <(antonym of "joined")-desktop><com>

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