Patch by Jeremy Mordkoff: jlm zazzletech com

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