From 70f1e062966d14768ef78d593259180efaa0b67b Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Fri, 28 Aug 2020 17:49:26 -0400 Subject: [PATCH] COPYING: Fix line wrapping in Exceptions section (#3692) The GPL text is formatted to a line width of around 75 characters. But the OpenShot-added "Exceptions" section was wrapped to something like 100 characters. Re-flowed to fit the rest of the file, without changes. --- COPYING | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/COPYING b/COPYING index 0a55612e..6fb90028 100644 --- a/COPYING +++ b/COPYING @@ -622,17 +622,18 @@ copy of the Program in return for a fee. 18. Exceptions The OpenShot Video Editor project hereby grants permission for non-GPL -compatible GStreamer, FFMPEG, and libopenshot to be used and distributed together with -GStreamer, FFMPEG, MLT, and OpenShot Video Editor. This permission is above and beyond -the permissions granted by the GPL license by which OpenShot Video Editor -is covered. If you modify this code, you may extend this exception to -your version of the code, but you are not obligated to do so. If you do -not wish to do so, delete this exception statement from your version. - - OpenShot Video Editor does not contain or use any proprietary codecs. We support -free and open-source codecs, such as Ogg Vorbis and Theora. However, since we use -the ffmpeg library, it is possible to use any ffmpeg supported codec, assuming -you have legal permission to do so. +compatible GStreamer, FFMPEG, and libopenshot to be used and distributed +together with GStreamer, FFMPEG, MLT, and OpenShot Video Editor. This +permission is above and beyond the permissions granted by the GPL license +by which OpenShot Video Editor is covered. If you modify this code, you +may extend this exception to your version of the code, but you are not +obligated to do so. If you do not wish to do so, delete this exception +statement from your version. + + OpenShot Video Editor does not contain or use any proprietary codecs. +We support free and open-source codecs, such as Ogg Vorbis and Theora. +However, since we use the ffmpeg library, it is possible to use any +ffmpeg supported codec, assuming you have legal permission to do so. - END OF TERMS AND CONDITIONS \ No newline at end of file + END OF TERMS AND CONDITIONS -- GitLab