[vlc-commits] es_out: don't tag preroll on blocks containing NEXT_DISPLAY_TIME

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Nov 23 17:28:05 2017 +0100| [3b97a38005b94958efeb6a0d0023a6f35e77f16e] | committer: Francois Cartegnie

es_out: don't tag preroll on blocks containing NEXT_DISPLAY_TIME

avoids dropping those, especially SPU on seek
refs #18862

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

 src/input/es_out.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 227f15faa0..df92fe89e2 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2070,7 +2070,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
         if( p_block->i_pts <= VLC_TS_INVALID )
             i_date = p_block->i_dts;
 
-        if( i_date < p_sys->i_preroll_end )
+        if( i_date + p_block->i_length < p_sys->i_preroll_end )
             p_block->i_flags |= BLOCK_FLAG_PREROLL;
     }