Patch by William R. Zwicky, wrzwicky pobox com

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