From cfaa21174e72dc00d073f3d6f6ce7f68330afff9 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 4 Jan 2021 12:31:09 +0100
Subject: Merge QAbstractPlanarVideoOutput into QAbstractVideoOutput

And while we're at it, sanitize the signature of the virtual
map() method.

Change-Id: I8feb09e1dd6abdd9f480e202568ff84e6c3c08a9
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 examples/multimedia/video/qmlvideofilter_opencl/rgbframehelper.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/multimedia/video/qmlvideofilter_opencl')

diff --git a/examples/multimedia/video/qmlvideofilter_opencl/rgbframehelper.h b/examples/multimedia/video/qmlvideofilter_opencl/rgbframehelper.h
index 1c8dbd857..638337ea4 100644
--- a/examples/multimedia/video/qmlvideofilter_opencl/rgbframehelper.h
+++ b/examples/multimedia/video/qmlvideofilter_opencl/rgbframehelper.h
@@ -113,7 +113,7 @@ class TextureBuffer : public QAbstractVideoBuffer
 public:
     TextureBuffer(uint id) : QAbstractVideoBuffer(GLTextureHandle), m_id(id) { }
     MapMode mapMode() const { return NotMapped; }
-    uchar *map(MapMode, int *, int *) { return 0; }
+    virtual MapData map(MapMode mode) { return {}; }
     void unmap() { }
     QVariant handle() const { return QVariant::fromValue<uint>(m_id); }
 
-- 
cgit v1.2.3