Skip to content

V
vlc-gpu
Commit 6aec5db7 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Used VLC_TS_INVALID/0 in MP4.

parent 5c8ab0cc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/demux/mp4/mp4.c
View file @ 6aec5db7
...@@ -616,7 +616,7 @@ static int Demux( demux_t *p_demux ) ...@@ -616,7 +616,7 @@ static int Demux( demux_t *p_demux )
MP4_UpdateSeekpoint( p_demux ); MP4_UpdateSeekpoint( p_demux );
/* first wait for the good time to read a packet */ /* first wait for the good time to read a packet */
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr + 1 ); es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
p_sys->i_pcr = MP4_GetMoviePTS( p_sys ); p_sys->i_pcr = MP4_GetMoviePTS( p_sys );
...@@ -713,7 +713,7 @@ static int Demux( demux_t *p_demux ) ...@@ -713,7 +713,7 @@ static int Demux( demux_t *p_demux )
} }
} }
/* dts */ /* dts */
p_block->i_dts = MP4_TrackGetDTS( p_demux, tk ) + 1; p_block->i_dts = VLC_TS_0 + MP4_TrackGetDTS( p_demux, tk );
/* pts */ /* pts */
i_delta = MP4_TrackGetPTSDelta( tk ); i_delta = MP4_TrackGetPTSDelta( tk );
if( i_delta != -1 ) if( i_delta != -1 )
...@@ -721,7 +721,7 @@ static int Demux( demux_t *p_demux ) ...@@ -721,7 +721,7 @@ static int Demux( demux_t *p_demux )
else if( tk->fmt.i_cat != VIDEO_ES ) else if( tk->fmt.i_cat != VIDEO_ES )
p_block->i_pts = p_block->i_dts; p_block->i_pts = p_block->i_dts;
else else
p_block->i_pts = 0; p_block->i_pts = VLC_TS_INVALID;
if( !tk->b_drms || ( tk->b_drms && tk->p_drms ) ) if( !tk->b_drms || ( tk->b_drms && tk->p_drms ) )
es_out_Send( p_demux->out, tk->p_es, p_block ); es_out_Send( p_demux->out, tk->p_es, p_block );
......
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