Based on patch by "mkhodor7 <-> yahoo | com"

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