1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp
index 74943ca64..992bcead2 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp
@@ -35,7 +35,7 @@
 
 #include "qandroidmediaplayercontrol.h"
 #include "qandroidmetadatareadercontrol.h"
-#include "qandroidvideorendercontrol.h"
+#include "qandroidmediaplayervideorenderercontrol.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -53,9 +53,9 @@ QAndroidMediaService::QAndroidMediaService(QObject *parent)
 
 QAndroidMediaService::~QAndroidMediaService()
 {
-    delete mMediaControl;
-    delete mMetadataControl;
     delete mVideoRendererControl;
+    delete mMetadataControl;
+    delete mMediaControl;
 }
 
 QMediaControl *QAndroidMediaService::requestControl(const char *name)
@@ -68,8 +68,7 @@ QMediaControl *QAndroidMediaService::requestControl(const char *name)
 
     if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
         if (!mVideoRendererControl) {
-            mVideoRendererControl = new QAndroidVideoRendererControl;
-            mMediaControl->setVideoOutput(mVideoRendererControl);
+            mVideoRendererControl = new QAndroidMediaPlayerVideoRendererControl(mMediaControl);
             return mVideoRendererControl;
         }
     }
@@ -80,7 +79,6 @@ QMediaControl *QAndroidMediaService::requestControl(const char *name)
 void QAndroidMediaService::releaseControl(QMediaControl *control)
 {
     if (control == mVideoRendererControl) {
-        mMediaControl->setVideoOutput(0);
         delete mVideoRendererControl;
         mVideoRendererControl = 0;
     }