[vlc-devel] [PATCH v3] input: fix `input-slave` option for subtitles

[Thomas Guillem]

LGTM

On Tue, Mar 30, 2021, at 15:29, Alaric Senat wrote:
> Since c34d719f, all files passed by the option `input-slave` were set as
> audio tracks no matter what.
> Theses changes force subtitle demux on files with a known spu extension.
> 
> Fixes #25549
> ---
>  src/input/input.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/src/input/input.c b/src/input/input.c
> index ea64473a0b..286dfe3fd7 100644
> --- a/src/input/input.c
> +++ b/src/input/input.c
> @@ -984,8 +984,17 @@ static void GetVarSlaves( input_thread_t *p_input,
>          if( uri == NULL )
>              continue;
>  
> +        enum slave_type i_type;
> +        if ( !input_item_slave_GetType(uri, &i_type) )
> +        {
> +            msg_Warn( p_input,
> +                     "Can't deduce slave type of `%s\" with file extension.",
> +                     uri );
> +            i_type = SLAVE_TYPE_AUDIO;
> +        }
>          input_item_slave_t *p_slave =
> -            input_item_slave_New( uri, SLAVE_TYPE_AUDIO, SLAVE_PRIORITY_USER );
> +            input_item_slave_New( uri, i_type, SLAVE_PRIORITY_USER );
> +
>          free( uri );
>  
>          if( unlikely( p_slave == NULL ) )
> -- 
> 2.29.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel