diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:03:28 +0200 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-01 07:28:44 +0000 |
commit | a330616496cf14e53db344513889444c6d60e7de (patch) | |
tree | 8e2b88bfbadfacb3c684dc7dc2fd8b18321e81ba /src/multimedia/video/qvideoframe.h | |
parent | 48206ccc29154a2ebdbe14c549c84b2e590b6a06 (diff) | |
parent | 545959e45ec86c70617f4839d20d931297c30c20 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/video/qvideoframe.h
Change-Id: I8458c4138be05f661d6528116cbc6b18298f0a91
Diffstat (limited to 'src/multimedia/video/qvideoframe.h')
-rw-r--r-- | src/multimedia/video/qvideoframe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index 617b0a1d9..8fcf47fc4 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,7 +101,8 @@ public: Format_CameraRaw, Format_AdobeDng, - Format_YUV422P, // ### Qt 6: reorder + Format_ABGR32, // ### Qt 6: reorder + Format_YUV422P, #ifndef Q_QDOC NPixelFormats, |