[vlc-devel] [PATCH 6/9] video_output: remove unneeded test after the assert on sys->display was added

[Thomas Guillem]

LGTM

On Thu, Oct 10, 2019, at 16:27, Steve Lhomme wrote:
> ---
>  src/video_output/video_output.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
> index 7e0df907e19..7b6703199c8 100644
> --- a/src/video_output/video_output.c
> +++ b/src/video_output/video_output.c
> @@ -1702,15 +1702,13 @@ void vout_StopDisplay(vout_thread_t *vout)
>          filter_DeleteBlend(sys->spu_blend);
>  
>      /* Destroy the rendering display */
> -    if (sys->display != NULL) {
> -        if (sys->decoder_pool != NULL)
> -            vout_FlushUnlocked(vout, true, INT64_MAX);
> +    if (sys->decoder_pool != NULL)
> +        vout_FlushUnlocked(vout, true, INT64_MAX);
>  
> -        vlc_mutex_lock(&sys->display_lock);
> -        vout_CloseWrapper(vout, sys->display);
> -        sys->display = NULL;
> -        vlc_mutex_unlock(&sys->display_lock);
> -    }
> +    vlc_mutex_lock(&sys->display_lock);
> +    vout_CloseWrapper(vout, sys->display);
> +    sys->display = NULL;
> +    vlc_mutex_unlock(&sys->display_lock);
>  
>      /* Destroy the video filters */
>      ThreadDelAllFilterCallbacks(vout);
> -- 
> 2.17.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel