Patch by Zhentan Feng <spyfeng gmail com>.

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