Patch from Diego Pettenò flameeyesATgmailDOTcom

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