Skip to content

V
vlc-gpu
Commit 98e031ff authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Used VLC_TS_INVALID/0 in subtitle_asa demuxer.

parent b2647565
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/demux/subtitle_asa.c
View file @ 98e031ff
...@@ -247,7 +247,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -247,7 +247,7 @@ static int Open ( vlc_object_t *p_this )
p_sys->i_length = p_sys->subtitle[p_sys->i_subtitles-1].i_stop; p_sys->i_length = p_sys->subtitle[p_sys->i_subtitles-1].i_stop;
/* +1 to avoid 0 */ /* +1 to avoid 0 */
if( p_sys->i_length <= 0 ) if( p_sys->i_length <= 0 )
p_sys->i_length = p_sys->subtitle[p_sys->i_subtitles-1].i_start+1; p_sys->i_length = p_sys->subtitle[p_sys->i_subtitles-1].i_start + VLC_TS_0;
} }
/* *** add subtitle ES *** */ /* *** add subtitle ES *** */
...@@ -447,9 +447,9 @@ static int Demux( demux_t *p_demux ) ...@@ -447,9 +447,9 @@ static int Demux( demux_t *p_demux )
continue; continue;
} }
p_block->i_pts = p_sys->subtitle[p_sys->i_subtitle].i_start; p_block->i_pts = VLC_TS_0 + p_sys->subtitle[p_sys->i_subtitle].i_start;
p_block->i_dts = p_block->i_pts; p_block->i_dts = VLC_TS_0 + p_block->i_pts;
if( p_sys->subtitle[p_sys->i_subtitle].i_stop > 0 ) if( p_sys->subtitle[p_sys->i_subtitle].i_stop >= 0 )
{ {
p_block->i_length = p_block->i_length =
p_sys->subtitle[p_sys->i_subtitle].i_stop - p_block->i_pts; p_sys->subtitle[p_sys->i_subtitle].i_stop - p_block->i_pts;
...@@ -457,7 +457,7 @@ static int Demux( demux_t *p_demux ) ...@@ -457,7 +457,7 @@ static int Demux( demux_t *p_demux )
memcpy( p_block->p_buffer, memcpy( p_block->p_buffer,
p_sys->subtitle[p_sys->i_subtitle].psz_text, i_len ); p_sys->subtitle[p_sys->i_subtitle].psz_text, i_len );
if( p_block->i_pts > 0 ) if( p_block->i_pts > VLC_TS_INVALID )
{ {
es_out_Send( p_demux->out, p_sys->es, p_block ); es_out_Send( p_demux->out, p_sys->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