Patch by Justin Ruggles jruggle earthlink net.

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