patch by Michael Chinen < mchinen gmail >

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