Move the PixelFormat enum from QVideoFrame to QVideoSurfaceFormat

Change-Id: Ifa888c74c397c640b19387a9ce624dfcf8269c2c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

4 files changed, 6 insertions, 6 deletions

diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
index 5167a49b8..78a724322 100644
--- a/dist/changes-5.13.1
+++ b/dist/changes-5.13.1
@@ -32,7 +32,7 @@ information about a particular change.
    * [QTBUG-65574] Added error when attempting to play a video without a video output set.
    * [QTBUG-65574] Added fix to prevent the same media content from being set twice.
    * [QTBUG-65574] Returns QMediaPlayer::NoMedia if an empty url is provided.
-   * [QTBUG-75959] Mapped MEDIASUBTYPE_RGB24 to QVideoFrame::Format_BGR24.
+   * [QTBUG-75959] Mapped MEDIASUBTYPE_RGB24 to QVideoSurfaceFormat::Format_BGR24.
    * [QTBUG-70655] Fixed build issues with newer MinGW versions.
    * Fixed memory leak introduced by using GetFrameRateList.
 
diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2
index 62dffcb02..a132744ab 100644
--- a/dist/changes-5.13.2
+++ b/dist/changes-5.13.2
@@ -1,7 +1,7 @@
 Qt 5.13.2 is a bug-fix release. It maintains both forward and backward
 source compatibility with Qt 5.13.0 through 5.13.1.
 In Qt 5.13.0, binary compatibility was broken due to the usage of the enum
-QVideoFrame::PixelFormat, the break has been reverted,
+QVideoSurfaceFormat::PixelFormat, the break has been reverted,
 thus introducing a binary compatibility break with earlier Qt 5.13.0 and 5.13.1.
 
 For more details, refer to the online documentation included in this
@@ -25,8 +25,8 @@ information about a particular change.
 ****************************************************************************
 
  - In Qt 5.13.0 binary compatibility was broken
-   for usage of the enum QVideoFrame::PixelFormat by introducing
-   QVideoFrame::Format_ABGR32.
+   for usage of the enum QVideoSurfaceFormat::PixelFormat by introducing
+   QVideoSurfaceFormat::Format_ABGR32.
    To minimize the impact of this, the break has been reverted,
    thus introducing a binary compatibility break with earlier Qt 5.13.x
    versions, but restoring compatibility with all earlier versions of Qt 5.
diff --git a/dist/changes-5.14.0 b/dist/changes-5.14.0
index 4f99255e2..fb4f46ba4 100644
--- a/dist/changes-5.14.0
+++ b/dist/changes-5.14.0
@@ -20,7 +20,7 @@ information about a particular change.
 ****************************************************************************
 
  - [QTBUG-73878] Removed the Mir client code as it is no longer used.
- - Added QVideoFrame::Format_YUV422P.
+ - Added QVideoSurfaceFormat::Format_YUV422P.
  - Deprecated canonicalUrl and canonicalRequest in QMediaContent.
  - [QTBUG-74422] Moved dtors of QCameraExposure, QCameraFocus,
    QCameraImageProcessing from private to protected.
diff --git a/dist/changes-5.15.1 b/dist/changes-5.15.1
index bffbec190..d7ec2c5dc 100644
--- a/dist/changes-5.15.1
+++ b/dist/changes-5.15.1
@@ -22,7 +22,7 @@ information about a particular change.
 ****************************************************************************
 
 - [QTBUG-85202] QMemoryVideoBuffer is not mapped when there is no data inside.
-- [QTBUG-52455] QVideoFrame::Format_Y8 is mapped to QImage::Format_Grayscale8.
+- [QTBUG-52455] QVideoSurfaceFormat::Format_Y8 is mapped to QImage::Format_Grayscale8.
 
 ****************************************************************************
 *                        Platform Specific Changes                         *