[FFmpeg-cvslog] LICENSE: Fix silly typo

Diego Biurrun git at videolan.org
Sat Jul 9 14:48:40 CEST 2016


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Jun 13 18:11:49 2016 +0200| [d6c2c2796d8885e99fc90793cdd7937826f82fab] | committer: Diego Biurrun

LICENSE: Fix silly typo

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6c2c2796d8885e99fc90793cdd7937826f82fab
---

 LICENSE |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 701e6e1..1eae4e7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -62,5 +62,5 @@ incompatible libraries
 The Fraunhofer AAC library, FAAC and OpenSSL are under licenses incompatible
 with all (L)GPL versions. Thus, unfortunately, since both licenses cannot be
 satisfied simultaneously, binaries resulting from the combination of Libav
-with these libraries are nonfree und unredistributable. If you wish to enable
+with these libraries are nonfree and unredistributable. If you wish to enable
 any of these libraries nonetheless, pass --enable-nonfree to configure.



More information about the ffmpeg-cvslog mailing list