Patch by Björn Axelsson bjorn axelsson intinor se

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