[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| [b5a0da4410f253e17aaddee7c45a7f5dc504ec6f] | committer: Steve Lhomme

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

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

 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 7045d36ff5..9ead6040a8 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -424,9 +424,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;