patch by Robert Marston, rmarston gmail com

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