patch by Bret Hughes <bhughes at elevating dot com> Originally committed as revision 4134 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 2439 to svn://svn.ffmpeg.org/ffmpeg/trunk