summaryrefslogtreecommitdiffstats
path: root/src/multimedia/doc
diff options
context:
space:
mode:
authorJøger Hansegård <joger.hansegard@qt.io>2023-11-02 15:52:32 +0100
committerJøger Hansegård <joger.hansegard@qt.io>2023-12-05 09:08:27 +0100
commit335ee775db270158455d9fbf89db5c7671003d8a (patch)
tree562c33ea02252802d9314e7cff201cca8ff20763 /src/multimedia/doc
parent678720188b9c2a8b23480075c0a895cd24853228 (diff)
Add Qt Multimedia attributions to "Licenses Used in Qt" page
This patch adds an attribution to FFmpeg which is used by QtMultimedia. Note that Qt Multimedia's landing page already had an attribution section. This content is now moved into the qt_attribution.json file for FFmpeg. The QtMultimedia landing page is simplified and refers to the attributions instead of going into the licensing details. This patch has one weakness. The automatic attribution generation adds a path to where the sources can be found. On the ffmpeg attribution page, it will state "The sources can be found in qtmultimedia/src/3rdparty/ffmpeg." This is not true, because the ffmpeg sources are not part of the Qt source tree, and are not located in the 3rdparty/ffmpeg directory. It is hard to find an appropriate copyright string for FFmpeg from their documentation. However, when running ffmpeg.exe, the text "Copyright (c) 2000-2023 the FFmpeg developers" shows up. This is used as a copyright string in this patch. The licensing terms for FFmpeg refers to use of libjpeg in FFmpeg. It is not possible to find which version of libjpeg is being used by FFmpeg, or what modifications have been made. We therefore just add the general Independent JPEG Group License. Change-Id: Ie8eba1fef0ac3b2e4283f7d88c20163eee49763e Task-number: QTBUG-118734 Fixes: QTBUG-118204 Pick-to: 6.6 6.5 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'src/multimedia/doc')
-rw-r--r--src/multimedia/doc/src/qtmultimedia-index.qdoc12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 3d652c686..7eb131062 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -164,14 +164,10 @@
the \l{GNU General Public License, version 2}.
See \l{Qt Licensing} for further details.
- The FFmpeg backend uses the \l {https://ffmpeg.org}{FFmpeg framework}.
- FFmpeg is licensed under LGPLv2.1, GPLv2, or later versions of the licenses.
- Some optional components of FFmpeg are only available under GPL. The FFmpeg
- backend shipped with the Qt binary packages is configured to not contain any
- of the components that are available under GPLv2 only.
-
- See the \l {https://ffmpeg.org/legal.html}{FFmpeg licensing page} for further
- details.
+ Furthermore, Qt Multimedia in Qt \QtVersion may contain third-party modules
+ under following permissive licenses:
+
+ \generatelist{groupsbymodule attributions-qtmultimedia}
Note that video compression standards, such as the H.264 media compression
standard, may be covered by patents and can incur royalty fees. This can