and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
courtesy of Aurelien Jacobs <aurel at gnuage dot org> Originally committed as revision 5028 to svn://svn.ffmpeg.org/ffmpeg/trunk