Patch by Thilo Borgmann <thilo.borgmann _at_ googlemail.com>

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