Derived from MPlayer patch by Larry Ruedisueli

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