Patch by Janne Grunau, janne-ffmpeg jannau net

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