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

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Jun  4 16:04:21 2015 +0200| [de9f21a4c8446be01f128400511fd57e869fabe5] | committer: Thomas Guillem

decoder: don't set first picture if decoder is flushing

This can happen when seeking via http.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=de9f21a4c8446be01f128400511fd57e869fabe5
---

 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 )
     {
         assert( p_owner->b_first );
         msg_Dbg( p_dec, "Received first picture" );