patch by John Van Sickle, john.vansickle gmail com

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