patch by Martin Storsjö, martin martin st and Ismail Dönmez, ismail namtrac org

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