Patch by R. Brian Anderson (andersrb AT cliftonlabs DOT com)

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