Based on patch by Jason Askew, jason dot askew at gmail dot com.

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