[vlc-devel] [PATCH 03/16] vlc_sout: use ops control when available

[Steve Lhomme]

If you remove it later in the patchset you should mention it's temporary 
not to break bisecting.

On 2021-03-15 18:02, Alexandre Janniaux wrote:
> ---
>   include/vlc_sout.h | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/include/vlc_sout.h b/include/vlc_sout.h
> index a5622eb131..646d3886a3 100644
> --- a/include/vlc_sout.h
> +++ b/include/vlc_sout.h
> @@ -169,7 +169,10 @@ static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... )
>       int     i_result;
>   
>       va_start( args, i_query );
> -    i_result = p_mux->pf_control( p_mux, i_query, args );
> +    if (p_mux->ops == NULL)
> +        i_result = p_mux->pf_control( p_mux, i_query, args );
> +    else
> +        i_result = p_mux->ops->control( p_mux, i_query, args );
>       va_end( args );
>       return i_result;
>   }
> -- 
> 2.30.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>