Patch by Joakim elupus ecce se Originally committed as revision 13527 to svn://svn.ffmpeg.org/ffmpeg/trunk