Originally committed as revision 16332 to svn://svn.ffmpeg.org/ffmpeg/trunk
Will be activated after a little more reviewing and fixing by me. Commited now, so as to not lose history of that. Originally committed as revision 16323 to svn://svn.ffmpeg.org/ffmpeg/trunk