[vlc-commits] demux/asf: fix stall on end-of-stream

Filip Roséen git at videolan.org
Thu Nov 10 18:30:49 CET 2016


vlc | branch: master | Filip Roséen <filip at atch.se> | Thu Nov 10 18:25:05 2016 +0100| [e5820468bce6a38ccab5d61225511f2280c6813d] | committer: Thomas Guillem

demux/asf: fix stall on end-of-stream

These changes are a fixup of e2fb104, in which a stupid brain-fart
caused me to invert the expression that is to see whether or not we
are at the end of stream.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 modules/demux/asf/asf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index b17e862..0a65dca 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -241,9 +241,9 @@ static int Demux( demux_t *p_demux )
             p_sys->i_time = p_sys->i_sendtime;
     }
 
-    if( !p_sys->b_eos && ( p_sys->i_sendtime - p_sys->i_time - CHUNK >= 0 &&
-                         ( p_sys->i_sendtime - p_sys->i_time - CHUNK ) /
-                           UINT64_C( 1000 ) >= p_sys->p_fp->i_preroll ) )
+    if( p_sys->b_eos || ( p_sys->i_sendtime - p_sys->i_time - CHUNK >= 0 &&
+                        ( p_sys->i_sendtime - p_sys->i_time - CHUNK ) /
+                          UINT64_C( 1000 ) >= p_sys->p_fp->i_preroll ) )
     {
         bool b_data = Block_Dequeue( p_demux, p_sys->i_time + CHUNK );
 



More information about the vlc-commits mailing list