Originally committed as revision 10979 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk