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

Derk-Jan Hartman hartman at videolan.org
Tue Jun 9 16:45:42 CEST 2009


I have not backported this yet, because it influences the logic of  
Demux_Seekable in that same file, because there it uses:

         es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es,  
&b );
         if( b && !tk->b_activated )

which behaviour I still need to verify.

DJ

On 9 jun 2009, at 16:38, git version control wrote:
> vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Tue  
> Jun  9 16:34:14 2009 +0200|  
> [a0d2358734e81e5928a5edb4e0ff47e38d7ed28f] | 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
>
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a0d2358734e81e5928a5edb4e0ff47e38d7ed28f
> ---
>
> 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 98f60d5..25d653b 100644
> --- a/modules/demux/avi/avi.c
> +++ b/modules/demux/avi/avi.c
> @@ -2461,7 +2461,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 );
>         }
>         else
>         {
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>




More information about the vlc-devel mailing list