Patch by Zhihang Wang, zhihang D wang A gmail

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