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