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