diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-01-04 12:31:09 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-22 06:58:14 +0000 |
commit | cfaa21174e72dc00d073f3d6f6ce7f68330afff9 (patch) | |
tree | d925688c02c5e6d9c596ba46be58ff2db6032078 /examples/multimedia/video | |
parent | c355d98b045834a494e9fda634388f82c8f625a9 (diff) |
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>
Diffstat (limited to 'examples/multimedia/video')
-rw-r--r-- | examples/multimedia/video/qmlvideofilter_opencl/rgbframehelper.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |