partly based on a patch by Zuxy Meng, zuxy.meng gmail com

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