summaryrefslogtreecommitdiffstats
path: root/src/multimedia/video/qvideosink.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-03-19 11:44:41 +0100
committerLars Knoll <lars.knoll@qt.io>2021-04-06 08:09:51 +0000
commit521bb5c66888a06a2dce3b4a79496076ef9455da (patch)
tree16f4481d110d41a1c61b4681d2a03b10904429ad /src/multimedia/video/qvideosink.cpp
parentc7e3fccbdcd91f2228534d12ac7e91a9c22c2516 (diff)
Kill QVideoFrame::PixmapHandle
This didn't make sense since Qt 5.0, as a pixmap is the same as an image in Qt 5/6. It was also completely unused. Change-Id: I97d548ca288c9aebb580f0fbaf9fbbba488e197a Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/multimedia/video/qvideosink.cpp')
-rw-r--r--src/multimedia/video/qvideosink.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/multimedia/video/qvideosink.cpp b/src/multimedia/video/qvideosink.cpp
index 405c0b4a9..8b6b088d2 100644
--- a/src/multimedia/video/qvideosink.cpp
+++ b/src/multimedia/video/qvideosink.cpp
@@ -277,9 +277,7 @@ void QVideoSink::paint(QPainter *painter, const QVideoFrame &f)
source = s;
}
- if (frame.handleType() == QVideoFrame::QPixmapHandle) {
- painter->drawPixmap(targetRect, frame.handle().value<QPixmap>(), source);
- } else if (frame.map(QVideoFrame::ReadOnly)) {
+ if (frame.map(QVideoFrame::ReadOnly)) {
QImage image = frame.image();
auto oldOpacity = painter->opacity();