Originally committed as revision 20893 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk