Patch by Stephen Warren, swarren nvidia com

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