diff options
| -rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/video/qvideoframe.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 961028024..2df52f360 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -1057,6 +1057,7 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = { /* Format_ARGB8565_Premultiplied */ nullptr, // Not needed /* Format_BGRA32 */ qt_convert_BGRA32_to_ARGB32, /* Format_BGRA32_Premultiplied */ qt_convert_BGRA32_to_ARGB32, + /* Format_ABGR32 */ nullptr, /* Format_BGR32 */ qt_convert_BGRA32_to_ARGB32, /* Format_BGR24 */ qt_convert_BGR24_to_ARGB32, /* Format_BGR565 */ qt_convert_BGR565_to_ARGB32, @@ -1066,6 +1067,7 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = { /* Format_AYUV444_Premultiplied */ nullptr, /* Format_YUV444 */ qt_convert_YUV444_to_ARGB32, /* Format_YUV420P */ qt_convert_YUV420P_to_ARGB32, + /* Format_YUV422P */ nullptr, /* Format_YV12 */ qt_convert_YV12_to_ARGB32, /* Format_UYVY */ qt_convert_UYVY_to_ARGB32, /* Format_YUYV */ qt_convert_YUYV_to_ARGB32, @@ -1080,8 +1082,6 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = { /* Format_Jpeg */ nullptr, // Not needed /* Format_CameraRaw */ nullptr, /* Format_AdobeDng */ nullptr, - /* Format_ABGR32 */ nullptr, // ### Qt 6: reorder - /* Format_YUV422P */ nullptr, }; static void qInitConvertFuncsAsm() diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index d043442a3..268e82d70 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -75,6 +75,7 @@ public: Format_ARGB8565_Premultiplied, Format_BGRA32, Format_BGRA32_Premultiplied, + Format_ABGR32, Format_BGR32, Format_BGR24, Format_BGR565, @@ -85,6 +86,7 @@ public: Format_AYUV444_Premultiplied, Format_YUV444, Format_YUV420P, + Format_YUV422P, Format_YV12, Format_UYVY, Format_YUYV, @@ -101,8 +103,6 @@ public: Format_CameraRaw, Format_AdobeDng, - Format_ABGR32, // ### Qt 6: reorder - Format_YUV422P, #ifndef Q_QDOC NPixelFormats, |