Merge remote-tracking branch 'origin/dev' into 6.2

Change-Id: I0f29cdfa94948a39a895a7678bcfe3a631d2d4ed

1 files changed, 7 insertions, 1 deletions

diff --git a/src/multimedia/platform/darwin/qdarwinintegration.mm b/src/multimedia/platform/darwin/qdarwinintegration.mm
index 511745ce1..753dabff4 100644
--- a/src/multimedia/platform/darwin/qdarwinintegration.mm
+++ b/src/multimedia/platform/darwin/qdarwinintegration.mm
@@ -46,6 +46,7 @@
 #include <private/avfmediaencoder_p.h>
 #include <private/qdarwinformatsinfo_p.h>
 #include <private/avfvideosink_p.h>
+#include <private/avfaudiodecoder_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -74,6 +75,11 @@ QPlatformMediaFormatInfo *QDarwinIntegration::formatInfo()
     return m_formatInfo;
 }
 
+QPlatformAudioDecoder *QDarwinIntegration::createAudioDecoder(QAudioDecoder *decoder)
+{
+    return new AVFAudioDecoder(decoder);
+}
+
 QPlatformMediaCaptureSession *QDarwinIntegration::createCaptureSession()
 {
     return new AVFCameraService;
@@ -89,7 +95,7 @@ QPlatformCamera *QDarwinIntegration::createCamera(QCamera *camera)
     return new AVFCamera(camera);
 }
 
-QPlatformMediaEncoder *QDarwinIntegration::createEncoder(QMediaEncoder *encoder)
+QPlatformMediaEncoder *QDarwinIntegration::createEncoder(QMediaRecorder *encoder)
 {
     return new AVFMediaEncoder(encoder);
 }