[vlc-devel] commit: avi demux: don't disable tracks when they end. (Derk-Jan Hartman )

git version control git at videolan.org
Tue Jun 9 21:21:36 CEST 2009

vlc | branch: 1.0-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Tue Jun  9 16:34:14 2009 +0200| [965741e82dacdfea880a2c4639f3c6f7595d7bdc] | committer: Derk-Jan Hartman 

avi demux: don't disable tracks when they end.

Disabling the tracks like this is an immediate action that messes up --file-caching for instance. There may be some cases where it is appropriate, and some cases where a track should be removed, but not when a track ends. In that case the core is responsible for cleanup.

Tested in bugfix for normal avi, broken avi and repaired avi, but not with "streamed" avi.

Should close #2853
(cherry picked from commit a0d2358734e81e5928a5edb4e0ff47e38d7ed28f)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

 modules/demux/avi/avi.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index bfea0b7..b264b8d 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -2511,7 +2511,6 @@ static int AVI_TrackStopFinishedStreams( demux_t *p_demux )
         if( tk->i_idxposc >= tk->i_idxnb )
             tk->b_activated = false;
-            if( tk->p_es ) es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->p_es, false );

More information about the vlc-devel mailing list