Patch by Rodney Baker, rodney dot baker at iinet dot net dot au

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