original patch by elupus _at_ ecce _dot_ se

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