Fix spelling of FFmpeg in (end-)user-visible strings

It's two capital "FF", lowercase "mpeg".

Pick-to: 6.7 6.6 6.5
Change-Id: I96d90ba959c5f52e998323800e97c8e72c731910
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>

8 files changed, 12 insertions, 12 deletions

diff --git a/src/3rdparty/ffmpeg/qt_attribution.json b/src/3rdparty/ffmpeg/qt_attribution.json
index 9e404b481..af4a7c743 100644
--- a/src/3rdparty/ffmpeg/qt_attribution.json
+++ b/src/3rdparty/ffmpeg/qt_attribution.json
@@ -4,7 +4,7 @@
         "Name": "FFmpeg",
         "QDocModule": "qtmultimedia",
         "Description": "FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles, and related metadata.",
-        "QtUsage": "The FFmpeg media backend uses the \\l {https://ffmpeg.org}{FFmpeg framework}. FFmpeg is licensed under LGPLv2.1 or later versions of the licenses. Note that, while FFMpeg also features some optional components available under GPL or LGPLv3, the binaries that ship with Qt in the online installer do not contain these components. See the \\l {https://ffmpeg.org/legal.html}{FFmpeg licensing page} for further details.",
+        "QtUsage": "The FFmpeg media backend uses the \\l {https://ffmpeg.org}{FFmpeg framework}. FFmpeg is licensed under LGPLv2.1 or later versions of the licenses. Note that, while FFmpeg also features some optional components available under GPL or LGPLv3, the binaries that ship with Qt in the online installer do not contain these components. See the \\l {https://ffmpeg.org/legal.html}{FFmpeg licensing page} for further details.",
         "Homepage": "https://ffmpeg.org/",
         "DownloadLocation": "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n6.1.zip",
         "SecurityCritical": true,
@@ -18,7 +18,7 @@
         "Name": "libjpeg",
         "QDocModule": "qtmultimedia",
         "Description": "libjpeg is a widely used C library for reading and writing JPEG image files.",
-        "QtUsage": "The FFMpeg media backend uses modified code from libjpeg in `libavcodec/jfdctfst.c`, `libavcodec/jfdctint_template.c` and `libavcodec/jrevdct.c`. For list of modifications, see \\l {https://git.ffmpeg.org/ffmpeg.git}{FFmpeg source code management system}.",
+        "QtUsage": "The FFmpeg media backend uses modified code from libjpeg in `libavcodec/jfdctfst.c`, `libavcodec/jfdctint_template.c` and `libavcodec/jrevdct.c`. For list of modifications, see \\l {https://git.ffmpeg.org/ffmpeg.git}{FFmpeg source code management system}.",
         "SecurityCritical": true,
         "Homepage": "https://libjpeg.sourceforge.net/",
         "DownloadLocation": "https://libjpeg.sourceforge.net/",
@@ -31,7 +31,7 @@
         "Name": "zlib",
         "QDocModule": "qtmultimedia",
         "Description": "Zlib is a software library used for data compression",
-        "QtUsage": "The FFMpeg media backend uses the Adler-32 algorithm from zlib",
+        "QtUsage": "The FFmpeg media backend uses the Adler-32 algorithm from zlib",
         "SecurityCritical": false,
         "Homepage": "https://www.zlib.net/",
         "DownloadLocation": "https://www.zlib.net/",
@@ -44,7 +44,7 @@
         "Name": "boost",
         "QDocModule": "qtmultimedia",
         "Description": "Boost is a set of libraries for the C++ programming language ",
-        "QtUsage": "The FFMpeg media backend uses algorithms from the Boost math library",
+        "QtUsage": "The FFmpeg media backend uses algorithms from the Boost math library",
         "SecurityCritical": false,
         "Homepage": "https://www.boost.org/",
         "DownloadLocation": "https://www.boost.org/",
diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
index 6132a68a2..3cfb11ff7 100644
--- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
@@ -80,7 +80,7 @@ if (ENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS)
     if (QT_FEATURE_vaapi AND NOT DYNAMIC_RESOLVE_VAAPI_SYMBOLS)
         if (NOT FFMPEG_SHARED_LIBRARIES)
             message(WARNING
-                   "QT_FEATURE_vaapi is found but statically built ffmpeg doesn't include vaapi,"
+                   "QT_FEATURE_vaapi is found but statically built FFmpeg doesn't include vaapi,"
                    "however dynamic symbols resolve is possible.")
         endif()
 
@@ -89,7 +89,7 @@ if (ENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS)
 
         message(FATAL_ERROR
                "QT_FEATURE_vaapi is not found "
-               "but ffmpeg includes VAAPI and dynamic symbols resolve is enabled.")
+               "but FFmpeg includes VAAPI and dynamic symbols resolve is enabled.")
     endif()
 endif()
 
diff --git a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegstreamdecoder.cpp b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegstreamdecoder.cpp
index 9427183ad..d7f313c04 100644
--- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegstreamdecoder.cpp
+++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegstreamdecoder.cpp
@@ -128,7 +128,7 @@ void StreamDecoder::decodeMedia(Packet packet)
         sendPacketResult = sendAVPacket(packet);
 
         if (sendPacketResult != AVERROR(EAGAIN))
-            qWarning() << "Unexpected ffmpeg behavior";
+            qWarning() << "Unexpected FFmpeg behavior";
     }
 
     if (sendPacketResult == 0)
diff --git a/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp b/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp
index d2bfe9969..7af5e528d 100644
--- a/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp
+++ b/src/plugins/multimedia/ffmpeg/qandroidcamera.cpp
@@ -285,7 +285,7 @@ void QAndroidCamera::setActive(bool active)
 
         // this should use the camera format.
         // but there is only 2 fully supported formats on android - JPG and YUV420P
-        // and JPEG is not supported for encoding in FFMpeg, so it's locked for YUV for now.
+        // and JPEG is not supported for encoding in FFmpeg, so it's locked for YUV for now.
         const static int imageFormat =
                 QJniObject::getStaticField<QtJniTypes::AndroidImageFormat, jint>("YUV_420_888");
         m_jniCamera.callMethod<jboolean>("addImageReader", jint(width), jint(height),
diff --git a/src/plugins/multimedia/ffmpeg/qandroidcameraframe.cpp b/src/plugins/multimedia/ffmpeg/qandroidcameraframe.cpp
index f04f24a08..ef088e6d7 100644
--- a/src/plugins/multimedia/ffmpeg/qandroidcameraframe.cpp
+++ b/src/plugins/multimedia/ffmpeg/qandroidcameraframe.cpp
@@ -146,7 +146,7 @@ bool QAndroidCameraFrame::parse(const QJniObject &frame)
         break;
     case QVideoFrameFormat::Format_Jpeg:
         qCWarning(qLCAndroidCameraFrame)
-                << "FFMpeg HW Mediacodec does not encode other than YCbCr formats";
+                << "FFmpeg HW Mediacodec does not encode other than YCbCr formats";
         // we still parse it to preview the frame
         m_image = QImage::fromData(buffer[0], bufferSize[0]);
         m_planes[0].rowStride = m_image.bytesPerLine();
diff --git a/src/plugins/multimedia/ffmpeg/qavfcamera.mm b/src/plugins/multimedia/ffmpeg/qavfcamera.mm
index bbabef583..38b743e65 100644
--- a/src/plugins/multimedia/ffmpeg/qavfcamera.mm
+++ b/src/plugins/multimedia/ffmpeg/qavfcamera.mm
@@ -293,7 +293,7 @@ uint32_t QAVFCamera::setPixelFormat(QVideoFrameFormat::PixelFormat cameraPixelFo
     }
 
     if (bestScore < DefaultAVScore)
-        qWarning() << "QCamera::setCameraFormat: Cannot find hw ffmpeg supported cv pix format";
+        qWarning() << "QCamera::setCameraFormat: Cannot find hw FFmpeg supported cv pix format";
 
     NSDictionary *outputSettings = @{
         (NSString *)kCVPixelBufferPixelFormatTypeKey : bestFormat,
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp
index 41e1e5b80..b00a6903f 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp
@@ -296,7 +296,7 @@ const CodecsStorage &codecsStorage(CodecStorageType codecsType)
                 && qEnvironmentVariableIsSet("QT_FFMPEG_DEBUG");
 
         if (shouldDumpCodecsInfo) {
-            qCDebug(qLcFFmpegUtils) << "Advanced ffmpeg codecs info:";
+            qCDebug(qLcFFmpegUtils) << "Advanced FFmpeg codecs info:";
             for (auto &storage : result) {
                 std::for_each(storage.begin(), storage.end(), &dumpCodecInfo);
                 qCDebug(qLcFFmpegUtils) << "---------------------------";
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp
index 570828190..78e265b4b 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp
@@ -110,7 +110,7 @@ static bool checkHwType(AVHWDeviceType type)
 {
     const auto deviceName = av_hwdevice_get_type_name(type);
     if (!deviceName) {
-        qWarning() << "Internal ffmpeg error, unknow hw type:" << type;
+        qWarning() << "Internal FFmpeg error, unknow hw type:" << type;
         return false;
     }