patch by Charles Yates, charles.yates gmail com

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