diff options
Diffstat (limited to 'src/multimedia/video')
-rw-r--r-- | src/multimedia/video/qabstractvideobuffer.h | 2 | ||||
-rw-r--r-- | src/multimedia/video/qabstractvideobuffer_p.h | 2 | ||||
-rw-r--r-- | src/multimedia/video/qimagevideobuffer_p.h | 6 | ||||
-rw-r--r-- | src/multimedia/video/qmemoryvideobuffer_p.h | 6 | ||||
-rw-r--r-- | src/multimedia/video/qvideosurfaceoutput_p.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h index dcefdf7bc..2352c0f3d 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -107,7 +107,7 @@ public: QAbstractPlanarVideoBuffer(HandleType type); virtual ~QAbstractPlanarVideoBuffer(); - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine); + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override; virtual int map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) = 0; protected: diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h index 6fbd75a30..9e3ced9b5 100644 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ b/src/multimedia/video/qabstractvideobuffer_p.h @@ -85,7 +85,7 @@ public: QAbstractPlanarVideoBufferPrivate() {} - int map(QAbstractVideoBuffer::MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]); + int map(QAbstractVideoBuffer::MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) override; private: Q_DECLARE_PUBLIC(QAbstractPlanarVideoBuffer) diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/video/qimagevideobuffer_p.h index 6fa742c88..f2b88dd9b 100644 --- a/src/multimedia/video/qimagevideobuffer_p.h +++ b/src/multimedia/video/qimagevideobuffer_p.h @@ -67,10 +67,10 @@ public: QImageVideoBuffer(const QImage &image); ~QImageVideoBuffer(); - MapMode mapMode() const; + MapMode mapMode() const override; - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine); - void unmap(); + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override; + void unmap() override; }; QT_END_NAMESPACE diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h index 132f9367c..e1b1f83a9 100644 --- a/src/multimedia/video/qmemoryvideobuffer_p.h +++ b/src/multimedia/video/qmemoryvideobuffer_p.h @@ -65,10 +65,10 @@ public: QMemoryVideoBuffer(const QByteArray &data, int bytesPerLine); ~QMemoryVideoBuffer(); - MapMode mapMode() const; + MapMode mapMode() const override; - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine); - void unmap(); + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override; + void unmap() override; }; QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h index bca288191..a1b24abbf 100644 --- a/src/multimedia/video/qvideosurfaceoutput_p.h +++ b/src/multimedia/video/qvideosurfaceoutput_p.h @@ -70,12 +70,12 @@ public: QVideoSurfaceOutput(QObject*parent = 0); ~QVideoSurfaceOutput(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const override; void setVideoSurface(QAbstractVideoSurface *surface); protected: - bool setMediaObject(QMediaObject *object); + bool setMediaObject(QMediaObject *object) override; private: QPointer<QAbstractVideoSurface> m_surface; |