Patch by David Conrad ( davedc_ | umbc edu )

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