Patch by Michael Kaufmann, hallo michael-kaufmann ch

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