Patch by Robert Swain, robert d swain a gmail d com

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