diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-09-24 12:25:29 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-09-25 09:11:15 +0200 |
| commit | bf6ac0f0df5510aa65ecd9bb050bd13d47089d4a (patch) | |
| tree | bfd8e19d6c6d3c44aa983433e87450ca744b8807 /src/multimedia | |
| parent | fdf2f673701fec9c3b99ad5e602d771c0b5ab9c9 (diff) | |
Move QVideoFrame::Format_ABGR32 to the end of the Pixel Formats
Since ABGR32 was introduced in 5.13.0 but placed in the middle of the list,
which breaks enum values.
[ChangeLog] In Qt 5.13.0 binary compatibility was broken
for usage of the enum QVideoFrame::PixelFormat by introducing QVideoFrame::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.
Change-Id: I3c490f2fc30f3b6914306b2d496724f12729338e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/video/qvideoframe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index 375f80dac..206658bc5 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -75,7 +75,6 @@ public: Format_ARGB8565_Premultiplied, Format_BGRA32, Format_BGRA32_Premultiplied, - Format_ABGR32, Format_BGR32, Format_BGR24, Format_BGR565, @@ -102,6 +101,7 @@ public: Format_CameraRaw, Format_AdobeDng, + Format_ABGR32, // ### Qt 6: reorder #ifndef Q_QDOC NPixelFormats, |