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