[vlc-devel] [PATCH] decoder: fix getting the decoder device when a new vout is not needed

Steve Lhomme robux4 at ycbcr.xyz
Mon Jan 6 15:22:52 CET 2020


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

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 2aaacf20441..9077517c18d 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -532,10 +532,16 @@ static int CreateVoutIfNeeded(struct decoder_owner *p_owner,
 
     if( !need_vout )
     {
-        if (pp_vout)
+        if (pp_vout || pp_dec_dev)
         {
             vlc_mutex_lock( &p_owner->lock );
-            *pp_vout = p_owner->p_vout;
+            if ( pp_vout ) *pp_vout = p_owner->p_vout;
+            if ( pp_dec_dev ) *pp_dec_dev = NULL;
+            vout_device_configuration_t cfg = {
+                .vout = p_owner->p_vout, .fmt = &p_dec->fmt_out.video,
+            };
+            input_resource_GetVoutDecoderDevice( p_owner->p_resource,
+                                                &cfg, order, pp_dec_dev );
             *order = p_owner->vout_order;
             vlc_mutex_unlock( &p_owner->lock );
         }
-- 
2.17.1



More information about the vlc-devel mailing list