[vlc-devel] [PATCH 13/31] input: resource: split the call to vout_Request()

[Steve Lhomme]

---
 src/input/resource.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/input/resource.c b/src/input/resource.c
index c0ae038c35..34b5e23f54 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -426,14 +426,20 @@ vout_thread_t *input_resource_GetVout(input_resource_t *p_resource,
     }
 #endif
 
-    if (vout_Request(cfg, dec_dev, p_resource->p_input)) {
+    if (vout_RequestDevice(cfg, dec_dev)) {
+        input_resource_PutVoutLocked(p_resource, cfg->vout, false);
+        vlc_mutex_unlock(&p_resource->lock);
+        return NULL;
+    }
+
+    int res = vout_RequestDisplay(cfg, p_resource->p_input);
+    if (res != 0) {
         input_resource_PutVoutLocked(p_resource, cfg->vout, false);
         vlc_mutex_unlock(&p_resource->lock);
         return NULL;
     }
 
     vout = cfg->vout;
-    *dec_dev = cfg->dec_devive;
     DisplayVoutTitle(p_resource, vout);
 
     /* Send original viewpoint to the input in order to update other ESes */
-- 
2.17.1