Skip to content

V
vlc-gpu
Commit 643080c5 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Updated ASF to use VLC_TS_INVALID/0.

parent cacaf61d
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
modules/demux/asf/asf.c
View file @ 643080c5
...@@ -594,10 +594,11 @@ static int DemuxPacket( demux_t *p_demux ) ...@@ -594,10 +594,11 @@ static int DemuxPacket( demux_t *p_demux )
/* send complete packet to decoder */ /* send complete packet to decoder */
block_t *p_gather = block_ChainGather( tk->p_frame ); block_t *p_gather = block_ChainGather( tk->p_frame );
tk->i_time = p_gather->i_dts; if( p_gather->i_dts > VLC_TS_INVALID )
tk->i_time = p_gather->i_dts - VLC_TS_0;
if( p_sys->i_time < 0 ) if( p_sys->i_time < 0 )
es_out_Control( p_demux->out, ES_OUT_SET_PCR, tk->i_time+1 ); es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + tk->i_time );
es_out_Send( p_demux->out, tk->p_es, p_gather ); es_out_Send( p_demux->out, tk->p_es, p_gather );
...@@ -617,13 +618,13 @@ static int DemuxPacket( demux_t *p_demux ) ...@@ -617,13 +618,13 @@ static int DemuxPacket( demux_t *p_demux )
if( tk->p_frame == NULL ) if( tk->p_frame == NULL )
{ {
p_frag->i_pts = i_pts + i_payload * (mtime_t)i_pts_delta; p_frag->i_pts = VLC_TS_0 + i_pts + i_payload * (mtime_t)i_pts_delta;
if( tk->i_cat != VIDEO_ES ) if( tk->i_cat != VIDEO_ES )
p_frag->i_dts = p_frag->i_pts; p_frag->i_dts = VLC_TS_0 + p_frag->i_pts;
else else
{ {
p_frag->i_dts = p_frag->i_pts; p_frag->i_dts = VLC_TS_0 + p_frag->i_pts;
p_frag->i_pts = 0; p_frag->i_pts = VLC_TS_INVALID;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment