and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 5846 to svn://svn.ffmpeg.org/ffmpeg/trunk