Patch by Elupus. Originally committed as revision 22814 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 19674 to svn://svn.ffmpeg.org/ffmpeg/trunk