diff options
| author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-08 10:37:08 +0200 |
|---|---|---|
| committer | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-08 11:07:25 +0200 |
| commit | e9d8f6a181ad1c2fff622e894b0c8353838d9b7a (patch) | |
| tree | 7a4ea2ffde40a2f76e5a106242d80d8673bbd16a | |
| parent | 047c1da00704c8287441abf1bf13e2141d1c3b5d (diff) | |
Fix qConvertFuncs to respect QVideoFrame::Format_ABGR32 in the end
Additional to bf6ac0 commit, need to fix convert funcs
Change-Id: I8eb82234557489e66bc179e1696afc154332b656
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
| -rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index e94b838f9..b466a3180 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -1048,7 +1048,6 @@ 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, @@ -1071,7 +1070,9 @@ static VideoFrameConvertFunc qConvertFuncs[QVideoFrame::NPixelFormats] = { /* Format_Y16 */ nullptr, /* Format_Jpeg */ nullptr, // Not needed /* Format_CameraRaw */ nullptr, - /* Format_AdobeDng */ nullptr + /* Format_AdobeDng */ nullptr, + /* Format_ABGR32 */ nullptr, // ### Qt 6: reorder + }; static void qInitConvertFuncsAsm() |