[vlc-commits] input: remove constant nul parameters

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 12 20:58:30 2019 +0200| [d97354341759dbe820d5e2dc0a147331199a4bf7] | committer: Rémi Denis-Courmont

input: remove constant nul parameters

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

 include/vlc_input.h              | 8 +++-----
 lib/video.c                      | 2 +-
 modules/gui/qt/input_manager.cpp | 2 +-
 src/input/control.c              | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index f5ca89762d..47e8ff5766 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -580,7 +580,7 @@ enum input_query_e
      * XXX You must release as soon as possible */
     INPUT_GET_AOUT,         /* arg1=audio_output_t **              res=can fail */
     INPUT_GET_VOUTS,        /* arg1=vout_thread_t ***, size_t *        res=can fail */
-    INPUT_GET_ES_OBJECTS,   /* arg1=int id, vlc_object_t **dec, vout_thread_t **, audio_output_t ** */
+    INPUT_GET_ES_OBJECTS,   /* arg1=int id, vlc_object_t **dec */
 
     /* Renderers */
     INPUT_SET_RENDERER,     /* arg1=vlc_renderer_item_t* */
@@ -720,11 +720,9 @@ static inline audio_output_t *input_GetAout( input_thread_t *p_input )
  * You may set pointer of pointer to NULL to avoid retrieving it.
  */
 static inline int input_GetEsObjects( input_thread_t *p_input, int i_id,
-                                      vlc_object_t **pp_decoder,
-                                      vout_thread_t **pp_vout, audio_output_t **pp_aout )
+                                      vlc_object_t **pp_decoder )
 {
-    return input_Control( p_input, INPUT_GET_ES_OBJECTS, i_id,
-                          pp_decoder, pp_vout, pp_aout );
+    return input_Control( p_input, INPUT_GET_ES_OBJECTS, i_id, pp_decoder );
 }
 
 /**
diff --git a/lib/video.c b/lib/video.c
index 6c35d78507..eadcbbabf4 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -516,7 +516,7 @@ void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page )
         telx = var_GetInteger( p_input_thread, "teletext-es" );
         if( telx >= 0 )
         {
-            if( input_GetEsObjects( p_input_thread, telx, &p_zvbi, NULL, NULL )
+            if( input_GetEsObjects( p_input_thread, telx, &p_zvbi )
                 == VLC_SUCCESS )
             {
                 var_SetInteger( p_zvbi, "vbi-page", i_page );
diff --git a/modules/gui/qt/input_manager.cpp b/modules/gui/qt/input_manager.cpp
index 6d4c2d4468..595b96248f 100644
--- a/modules/gui/qt/input_manager.cpp
+++ b/modules/gui/qt/input_manager.cpp
@@ -595,7 +595,7 @@ void InputManager::UpdateTeletext()
             vlc_object_release( p_input_vbi );
         }
 
-        if( input_GetEsObjects( p_input, i_teletext_es, &p_input_vbi, NULL, NULL ) )
+        if( input_GetEsObjects( p_input, i_teletext_es, &p_input_vbi ) )
             p_input_vbi = NULL;
 
         if( p_input_vbi )
diff --git a/src/input/control.c b/src/input/control.c
index ae30ee1395..d318012732 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -316,8 +316,8 @@ 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 = va_arg( args, vout_thread_t ** );
-            audio_output_t **pp_aout = va_arg( args, audio_output_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,