[vlc-devel] [PATCH 6/9] resource: remove now always NULL parameter

[remi at remlab.net]

From: Rémi Denis-Courmont <remi at remlab.net>

---
 src/input/input.c    | 2 +-
 src/input/resource.c | 4 ++--
 src/input/resource.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 4ac78a14c6..0319505532 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -806,7 +806,7 @@ static int InitSout( input_thread_t * p_input )
     }
     if( psz && strncasecmp( priv->p_item->psz_uri, "vlc:", 4 ) )
     {
-        priv->p_sout  = input_resource_RequestSout( priv->p_resource, NULL, psz );
+        priv->p_sout  = input_resource_RequestSout( priv->p_resource, psz );
         if( priv->p_sout == NULL )
         {
             input_ChangeState( p_input, ERROR_S, VLC_TICK_INVALID );
diff --git a/src/input/resource.c b/src/input/resource.c
index 27ce970860..d2c1ab844f 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -621,11 +621,11 @@ void input_resource_StopFreeVout(input_resource_t *p_resource)
 }
 
 /* */
-sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, sout_instance_t *p_sout, const char *psz_sout )
+sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, const char *psz_sout )
 {
     assert(psz_sout != NULL);
     vlc_mutex_lock( &p_resource->lock );
-    sout_instance_t *p_ret = RequestSout( p_resource, p_sout, psz_sout );
+    sout_instance_t *p_ret = RequestSout( p_resource, NULL, psz_sout );
     vlc_mutex_unlock( &p_resource->lock );
 
     return p_ret;
diff --git a/src/input/resource.h b/src/input/resource.h
index 66fdf997f8..bd1023379d 100644
--- a/src/input/resource.h
+++ b/src/input/resource.h
@@ -35,7 +35,7 @@ void input_resource_SetInput( input_resource_t *, input_thread_t * );
 /**
  * This function handles sout request.
  */
-sout_instance_t *input_resource_RequestSout( input_resource_t *, sout_instance_t *, const char *psz_sout );
+sout_instance_t *input_resource_RequestSout( input_resource_t *, const char * );
 void input_resource_PutSout(input_resource_t *, sout_instance_t *);
 
 vout_thread_t *input_resource_RequestVout(input_resource_t *, vlc_video_context *,
-- 
2.30.0