and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
patch by Michael Benjamin, neuroptik gmail com Originally committed as revision 6282 to svn://svn.ffmpeg.org/ffmpeg/trunk