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