Originally committed as revision 22470 to svn://svn.ffmpeg.org/ffmpeg/trunk
Code produced during SoC by Robert Swain and Colin McQuillan. Originally committed as revision 21943 to svn://svn.ffmpeg.org/ffmpeg/trunk