Patch by Josh Allmann (joshua allmann gmail com)

Originally committed as revision 22632 to svn://svn.ffmpeg.org/ffmpeg/trunk