patch by Colin Ward, hitman*at*codehq*dot*org

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