[vlc-devel] [PATCH] decoder: fix abort on vout failure

[Steve Lhomme]

LGTM

On 2021-01-14 12:02, Thomas Guillem wrote:
> Don't notify the format changed if the output creation failed.
> 
> Regression from 0abed25515a492896c89cf36ab1e4befc7dd23b6
> 
> Fixes #25387
> ---
>   src/input/decoder.c | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/src/input/decoder.c b/src/input/decoder.c
> index f2f643fb656..d475f3d207b 100644
> --- a/src/input/decoder.c
> +++ b/src/input/decoder.c
> @@ -2545,6 +2545,14 @@ bool vlc_input_decoder_HasFormatChanged( vlc_input_decoder_t *p_owner,
>           return false;
>   
>       vlc_mutex_lock( &p_owner->lock );
> +
> +    if( p_owner->fmt.i_cat == UNKNOWN_ES )
> +    {
> +        /* The format changed but the output creation failed */
> +        vlc_mutex_unlock( &p_owner->lock );
> +        return false;
> +    }
> +
>       if( p_fmt != NULL )
>           es_format_Copy( p_fmt, &p_owner->fmt );
>   
> -- 
> 2.29.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>