ad556addfd
This includes a revert of r25840 Originally committed as revision 25842 to svn://svn.ffmpeg.org/ffmpeg/trunk