Fixes issues 1464 and 1468. Originally committed as revision 20312 to svn://svn.ffmpeg.org/ffmpeg/trunk
Attach a file by drag & drop or click to upload
