Patch by John Stebbins stebbins jetheaddev com.

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