Patch by Vincent Penné vpenne wyplay com and Denes Balatoni

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