based on a patch by Michael Kostylev, michael.kostylev gmail com

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