Patch by roundup user shinya, tesutosan hotmail

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