Patch by JonY <10walls at gmail dot com>

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