Originally committed as revision 12843 to svn://svn.ffmpeg.org/ffmpeg/trunk
patch by Alexander Strange, astrange ithinksw com Originally committed as revision 12794 to svn://svn.ffmpeg.org/ffmpeg/trunk