patch by Marc Hoffman, mmh pleasantst com

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