diff options
| author | Jøger Hansegård <joger.hansegard@qt.io> | 2024-02-13 18:20:11 +0100 |
|---|---|---|
| committer | Jøger Hansegård <joger.hansegard@qt.io> | 2024-02-15 10:23:49 +0000 |
| commit | 792ff0010325e89fa149766caf14c8918065250b (patch) | |
| tree | 12610d4c000d7540051bc5f10b09c4d982343717 /src/multimedia | |
| parent | 997b2eb99923eec8012cdc2a84768c839ed6267f (diff) | |
Update doc and attributions with new FFmpeg version in Multimedia
We are upgrading from FFmpeg n6.0 to FFmpeg n6.1 in QtMultimedia. This
patch updates the documentation to agree with the version used in the
implementation.
[ChangeLog][Third-Party Code] Updated FFmpeg to n6.1.
Task-number: QTBUG-121343
Pick-to: 6.5 6.6 6.7
Change-Id: I4e08d8e7f16461d25970f3c6dfdeb77a0293af25
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Diffstat (limited to 'src/multimedia')
| -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 6ab71303e..c9b6f3add 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.0} and is tested + The version shipped with Qt binary packages is \b{FFmpeg 6.1} and is tested by the maintainers. \note See \l{Licenses and Attributions} regarding what components are removed |