[vlc-commits] decoder: remove locally stored decoder device

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Sep 30 08:17:07 2019 +0200| [55a398c1a73d6cd2940a4649dadae07e4de0c963] | committer: Steve Lhomme

decoder: remove locally stored decoder device

It's kept in the input resources and will come embedded in the video context.

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

 src/input/decoder.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 83dd024760..2caeb1abd1 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -124,7 +124,6 @@ struct decoder_owner
 
     vout_thread_t   *p_vout;
     enum vlc_vout_order vout_order;
-    vlc_decoder_device *p_dec_dev; // TEMPORARY
 
     /* -- Theses variables need locking on read *and* write -- */
     /* Preroll */
@@ -613,14 +612,11 @@ static int CreateVoutIfNeeded(struct decoder_owner *p_owner,
     p_owner->vout_order = *order;
     if ( pp_dec_dev )
     {
-        if ( p_owner->p_dec_dev != NULL )
-            vlc_decoder_device_Release( p_owner->p_dec_dev );
         if( p_vout == NULL && *pp_dec_dev != NULL )
         {
             vlc_decoder_device_Release( *pp_dec_dev );
             *pp_dec_dev = NULL;
         }
-        p_owner->p_dec_dev = *pp_dec_dev ? vlc_decoder_device_Hold(*pp_dec_dev) : NULL;
     }
 
     DecoderUpdateFormatLocked( p_owner );
@@ -1998,9 +1994,6 @@ static void DeleteDecoder( decoder_t * p_dec )
     const enum es_format_category_e i_cat =p_dec->fmt_in.i_cat;
     decoder_Clean( p_dec );
 
-    if ( p_owner->p_dec_dev )
-        vlc_decoder_device_Release( p_owner->p_dec_dev );
-
     if (p_owner->vctx)
         vlc_video_context_Release( p_owner->vctx );