Patch by Florian Echtler: floe butterbrot org

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