[vlc-commits] es_out: remove constant nul parameters

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 12 21:01:45 2019 +0200| [19100de335f3af991c91dfcd8d1fc0a185c31b07] | committer: Rémi Denis-Courmont

es_out: remove constant nul parameters

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

 src/input/control.c | 4 +---
 src/input/es_out.c  | 7 -------
 src/input/es_out.h  | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/input/control.c b/src/input/control.c
index d318012732..75df5a00f9 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -316,12 +316,10 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
         {
             const int i_id = va_arg( args, int );
             vlc_object_t **pp_decoder = va_arg( args, vlc_object_t ** );
-            vout_thread_t **pp_vout = NULL;
-            audio_output_t **pp_aout = NULL;
 
             return es_out_Control( priv->p_es_out_display,
                                    ES_OUT_GET_ES_OBJECTS_BY_ID, i_id,
-                                   pp_decoder, pp_vout, pp_aout );
+                                   pp_decoder );
         }
 
         case INPUT_GET_PCR_SYSTEM:
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 98b7da3c86..8f773db4d8 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2941,22 +2941,15 @@ static int EsOutVaControlLocked( es_out_t *out, int i_query, va_list args )
             return VLC_EGENERIC;
 
         vlc_object_t    **pp_decoder = va_arg( args, vlc_object_t ** );
-        vout_thread_t   **pp_vout    = va_arg( args, vout_thread_t ** );
-        audio_output_t **pp_aout    = va_arg( args, audio_output_t ** );
         if( p_es->p_dec )
         {
             if( pp_decoder )
                 *pp_decoder = vlc_object_hold( p_es->p_dec );
-            input_DecoderGetObjects( p_es->p_dec, pp_vout, pp_aout );
         }
         else
         {
             if( pp_decoder )
                 *pp_decoder = NULL;
-            if( pp_vout )
-                *pp_vout = NULL;
-            if( pp_aout )
-                *pp_aout = NULL;
         }
         return VLC_SUCCESS;
     }
diff --git a/src/input/es_out.h b/src/input/es_out.h
index 4e370c5eb4..7cbea71728 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -47,7 +47,7 @@ enum es_out_query_private_e
     ES_OUT_SET_ES_BY_ID,                            /* arg1= int, arg2= bool (forced) */
     ES_OUT_RESTART_ES_BY_ID,
     ES_OUT_SET_ES_DEFAULT_BY_ID,
-    ES_OUT_GET_ES_OBJECTS_BY_ID,                    /* arg1=int id, vlc_object_t **dec, vout_thread_t **, audio_output_t ** res=can fail*/
+    ES_OUT_GET_ES_OBJECTS_BY_ID,                    /* arg1=int id, vlc_object_t **dec res=can fail*/
 
     /* Stop all selected ES and save the stopped state in a context. free the
      * context or call ES_OUT_STOP_ALL_ES */