Skip to content

Commit

Permalink
COPYING: Fix line wrapping in Exceptions section (#3692)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ferdnyc committed Aug 28, 2020
1 parent 6053a3c commit 70f1e06
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions COPYING
Expand Up @@ -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
END OF TERMS AND CONDITIONS

0 comments on commit 70f1e06

Please sign in to comment.