patch by Björn Axelsson: [bjorn axelsson intinor se]

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