diff options
author | Ville Voutilainen <ville.voutilainen@qt.io> | 2022-12-19 20:28:53 +0200 |
---|---|---|
committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2022-12-20 10:43:08 +0000 |
commit | e70a2a34f10473bc6e72e4c2d34e0188e3114389 (patch) | |
tree | 2a7d2c0357191e4f71c3dd9a90beae15bb2b86d8 /src/plugins | |
parent | 8f04cd087e8eb566e85faeed4332bfcd4f9e6579 (diff) |
Fix confusion with unistd.h functions
Task-number: QTBUG-109491
Change-Id: If1b830c75cbb61062a323b6e87eb26f2ee5fa012
Pick-to: 6.5 6.4
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp | 6 | ||||
-rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp index 1fa7da3d7..525cc691a 100644 --- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp +++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp @@ -38,7 +38,7 @@ static void insertMediaData(QMediaMetaData &metaData, QPlatformMediaPlayer::Trac } }; -static int read(void *opaque, uint8_t *buf, int buf_size) +static int readQIODevice(void *opaque, uint8_t *buf, int buf_size) { auto *dev = static_cast<QIODevice *>(opaque); if (dev->atEnd()) @@ -46,7 +46,7 @@ static int read(void *opaque, uint8_t *buf, int buf_size) return dev->read(reinterpret_cast<char *>(buf), buf_size); } -static int64_t seek(void *opaque, int64_t offset, int whence) +static int64_t seekQIODevice(void *opaque, int64_t offset, int whence) { QIODevice *dev = static_cast<QIODevice *>(opaque); @@ -103,7 +103,7 @@ MediaDataHolder::recreateAVFormatContext(const QUrl &media, QIODevice *stream) constexpr int bufferSize = 32768; unsigned char *buffer = (unsigned char *)av_malloc(bufferSize); - context->pb = avio_alloc_context(buffer, bufferSize, false, stream, &read, nullptr, &seek); + context->pb = avio_alloc_context(buffer, bufferSize, false, stream, &readQIODevice, nullptr, &seekQIODevice); } int ret = avformat_open_input(&context, url.constData(), nullptr, nullptr); diff --git a/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp b/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp index aefa3a884..c87211910 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp @@ -939,7 +939,7 @@ Decoder::~Decoder() demuxer->kill(); } -static int read(void *opaque, uint8_t *buf, int buf_size) +static int readQIODevice(void *opaque, uint8_t *buf, int buf_size) { auto *dev = static_cast<QIODevice *>(opaque); if (dev->atEnd()) @@ -947,7 +947,7 @@ static int read(void *opaque, uint8_t *buf, int buf_size) return dev->read(reinterpret_cast<char *>(buf), buf_size); } -static int64_t seek(void *opaque, int64_t offset, int whence) +static int64_t seekQIODevice(void *opaque, int64_t offset, int whence) { QIODevice *dev = static_cast<QIODevice *>(opaque); @@ -1062,7 +1062,7 @@ void Decoder::setMedia(const QUrl &media, QIODevice *stream) context = avformat_alloc_context(); constexpr int bufferSize = 32768; unsigned char *buffer = (unsigned char *)av_malloc(bufferSize); - context->pb = avio_alloc_context(buffer, bufferSize, false, stream, ::read, nullptr, ::seek); + context->pb = avio_alloc_context(buffer, bufferSize, false, stream, &readQIODevice, nullptr, &seekQIODevice); } int ret = avformat_open_input(&context, url.constData(), nullptr, nullptr); |