[vlc-devel] [PATCH] decoder: don't set first picture if decoder is flushing

[Rémi Denis-Courmont]

Le 2015-06-04 17:29, Thomas Guillem a écrit :
> This can happen when seeking via http.

> ---
>  src/input/decoder.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/input/decoder.c b/src/input/decoder.c
> index 3fb695f..0b86578 100644
> --- a/src/input/decoder.c
> +++ b/src/input/decoder.c
> @@ -880,7 +880,7 @@ static void DecoderPlayVideo( decoder_t *p_dec,
> picture_t *p_picture,
>
>      bool b_reject = DecoderWaitUnblock( p_dec );
>
> -    if( p_owner->b_waiting )
> +    if( !b_reject && p_owner->b_waiting )

It would seem reasonable, but I fear this might introduce deadlocks. 
Did you check the history of that code path?

>      {
>          assert( p_owner->b_first );
>          msg_Dbg( p_dec, "Received first picture" );

-- 
Rémi Denis-Courmont
http://www.remlab.net/