Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail

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