Skip to content

Commit 70f1e06

Browse files
authored
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.
1 parent 6053a3c commit 70f1e06

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

COPYING

+13-12
Original file line numberDiff line numberDiff line change
@@ -622,17 +622,18 @@ copy of the Program in return for a fee.
622622
18. Exceptions
623623

624624
The OpenShot Video Editor project hereby grants permission for non-GPL
625-
compatible GStreamer, FFMPEG, and libopenshot to be used and distributed together with
626-
GStreamer, FFMPEG, MLT, and OpenShot Video Editor. This permission is above and beyond
627-
the permissions granted by the GPL license by which OpenShot Video Editor
628-
is covered. If you modify this code, you may extend this exception to
629-
your version of the code, but you are not obligated to do so. If you do
630-
not wish to do so, delete this exception statement from your version.
631-
632-
OpenShot Video Editor does not contain or use any proprietary codecs. We support
633-
free and open-source codecs, such as Ogg Vorbis and Theora. However, since we use
634-
the ffmpeg library, it is possible to use any ffmpeg supported codec, assuming
635-
you have legal permission to do so.
625+
compatible GStreamer, FFMPEG, and libopenshot to be used and distributed
626+
together with GStreamer, FFMPEG, MLT, and OpenShot Video Editor. This
627+
permission is above and beyond the permissions granted by the GPL license
628+
by which OpenShot Video Editor is covered. If you modify this code, you
629+
may extend this exception to your version of the code, but you are not
630+
obligated to do so. If you do not wish to do so, delete this exception
631+
statement from your version.
632+
633+
OpenShot Video Editor does not contain or use any proprietary codecs.
634+
We support free and open-source codecs, such as Ogg Vorbis and Theora.
635+
However, since we use the ffmpeg library, it is possible to use any
636+
ffmpeg supported codec, assuming you have legal permission to do so.
636637

637638

638-
END OF TERMS AND CONDITIONS
639+
END OF TERMS AND CONDITIONS

0 commit comments

Comments
 (0)