Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 24798 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 24790 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk