diff options
| author | Jøger Hansegård <joger.hansegard@qt.io> | 2024-03-26 15:24:14 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-27 06:35:33 +0000 |
| commit | 3ffcd66c573f843c36dc59569e85fbbf93b4325c (patch) | |
| tree | 2280434b3ffe2d2354ebc42f717d93568077ea8c | |
| parent | ecc2e847af59d14df540d69a77ba6ecbe10598db (diff) | |
Document that FFmpeg 6.1.1 is used by the FFmpeg multimedia backend
Pick-to: 6.5
Change-Id: I93a6a4f24fa5901babb8075aaffb640a66f245aa
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit c47cd30cbafcf9fcceeacedea97345a1868c0e3d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1c2ec787d6ff191debdefa1b55029087b5e7b7c0)
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index c9b6f3add..a89bfd6f6 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -187,7 +187,7 @@ In this release the \l {http://ffmpeg.org}{FFmpeg framework} is set as the default backend on Windows, macOS, Android, and Linux except Yocto distribution. - The version shipped with Qt binary packages is \b{FFmpeg 6.1} and is tested + The version shipped with Qt binary packages is \b{FFmpeg 6.1.1} and is tested by the maintainers. \note See \l{Licenses and Attributions} regarding what components are removed |