Skip to content

V
vlc-2-2
Commit ac7fb43a authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

CC: use VLC_TS_INVALID (refs #3135)

parent 55c17a70
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/codec/cc.c
View file @ ac7fb43a
...@@ -294,11 +294,11 @@ static block_t *Pop( decoder_t *p_dec ) ...@@ -294,11 +294,11 @@ static block_t *Pop( decoder_t *p_dec )
return NULL; return NULL;
p_block = p_sys->pp_block[i_index = 0]; p_block = p_sys->pp_block[i_index = 0];
if( p_block->i_pts > 0 ) if( p_block->i_pts > VLC_TS_INVALID )
{ {
for( i = 1; i < p_sys->i_block-1; i++ ) for( i = 1; i < p_sys->i_block-1; i++ )
{ {
if( p_sys->pp_block[i]->i_pts > 0 && p_block->i_pts > 0 && if( p_sys->pp_block[i]->i_pts > VLC_TS_INVALID && p_block->i_pts > VLC_TS_INVALID &&
p_sys->pp_block[i]->i_pts < p_block->i_pts ) p_sys->pp_block[i]->i_pts < p_block->i_pts )
p_block = p_sys->pp_block[i_index = i]; p_block = p_sys->pp_block[i_index = i];
} }
...@@ -317,7 +317,7 @@ static subpicture_t *Subtitle( decoder_t *p_dec, char *psz_subtitle, char *psz_h ...@@ -317,7 +317,7 @@ static subpicture_t *Subtitle( decoder_t *p_dec, char *psz_subtitle, char *psz_h
video_format_t fmt; video_format_t fmt;
/* We cannot display a subpicture with no date */ /* We cannot display a subpicture with no date */
if( i_pts == 0 ) if( i_pts <= VLC_TS_INVALID )
{ {
msg_Warn( p_dec, "subtitle without a date" ); msg_Warn( p_dec, "subtitle without a date" );
return NULL; return NULL;
......
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