From 4fa23e08a116b4d9bb67e25771c511838104999f Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@theqtcompany.com>
Date: Wed, 10 Feb 2016 14:52:44 +0100
Subject: AVFoundation: implement QVideoEncoderSettingsControl.

Task-number: QTBUG-40338
Change-Id: Ic23dabaad94d7b293019460710ae1a097002e227
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
---
 src/plugins/avfoundation/camera/avfcamerasession.mm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')

diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 993e28319..eac1b44ec 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -386,13 +386,11 @@ bool AVFCameraSession::applyViewfinderSettings()
         // resolution is set, it takes precedence over the viewfinder resolution.
         if (AVFImageEncoderControl *imControl = m_service->imageEncoderControl()) {
             const QSize imageResolution(imControl->requestedSettings().resolution());
-            if (!imageResolution.isNull() && imageResolution.isValid()) {
+            if (!imageResolution.isNull() && imageResolution.isValid())
                 vfSettings.setResolution(imageResolution);
-                vfControl->setViewfinderSettings(vfSettings);
-            }
         }
 
-        return vfControl->applySettings();
+        return vfControl->applySettings(vfSettings);
     }
 
     return false;
-- 
cgit v1.2.3