[vlc-commits] input: resource: get the decoder device before calling vout_Request()

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul  1 13:51:53 2019 +0200| [fe049e8cd65ec850c417c2d28ba7c26b583d1d89] | committer: Steve Lhomme

input: resource: get the decoder device before calling vout_Request()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fe049e8cd65ec850c417c2d28ba7c26b583d1d89
---

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

diff --git a/src/input/resource.c b/src/input/resource.c
index 984d68e3ff..71cbbda2f6 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -426,9 +426,12 @@ vout_thread_t *input_resource_GetVoutDecoderDevice(input_resource_t *p_resource,
     }
 #endif
 
-    vlc_decoder_device *dec_dev = vout_GetDevice(cfg);
+    if (pp_dec_dev)
+    {
+        *pp_dec_dev = vout_GetDevice(cfg);
+    }
 
-    if (vout_Request(cfg, dec_dev, p_resource->p_input)) {
+    if (vout_Request(cfg, pp_dec_dev ? *pp_dec_dev : NULL, p_resource->p_input)) {
         input_resource_PutVoutLocked(p_resource, cfg->vout, false);
         vlc_mutex_unlock(&p_resource->lock);
         return NULL;