Originally committed as revision 16012 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 15356 to svn://svn.ffmpeg.org/ffmpeg/trunk