patch by Gwenole Beauchesne, gbeauchesne,splitted-desktop,com

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