Patch by Frank Barchard, fbarchard google

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