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>

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
index aea3e0e61..14f9309db 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -101,7 +101,7 @@ public:
 
     [[nodiscard]] QVariant handle() const override { return m_textureId; }
 
-    uchar *map(MapMode, int *, int *) override { return nullptr; }
+    MapData map(MapMode) override { return {}; }
     void unmap() override {}
     [[nodiscard]] MapMode mapMode() const override { return NotMapped; }
 
@@ -118,7 +118,7 @@ public:
         : QAbstractVideoBuffer(UserHandle)
     {}
 
-    uchar *map(MapMode, int *, int *) override { return nullptr; }
+    MapData map(MapMode) override { return {}; }
     void unmap() override {}
     [[nodiscard]] MapMode mapMode() const override { return NotMapped; }
 };