[FFmpeg-cvslog] r23395 - in branches/0.6: . LICENSE

[siretart]

Author: siretart
Date: Mon May 31 23:49:53 2010
New Revision: 23395

Log:
Add a short note about libvpx.


backport r23394 by diego

Modified:
   branches/0.6/   (props changed)
   branches/0.6/LICENSE

Modified: branches/0.6/LICENSE
==============================================================================
--- branches/0.6/LICENSE	Mon May 31 23:41:53 2010	(r23394)
+++ branches/0.6/LICENSE	Mon May 31 23:49:53 2010	(r23395)
@@ -48,3 +48,7 @@ version needs to be upgraded by passing 
 The nonfree external library libfaac can be hooked up in FFmpeg. You need to
 pass --enable-nonfree to configure to enable it. Employ this option with care
 as FFmpeg then becomes nonfree and unredistributable.
+
+The libvpx external library has a license that is (L)GPL incompatible. If you
+combine it with FFmpeg the resulting binaries are unredistributable. Thus you
+need to pass --enable-nonfree to configure to enable it.