Commit 97c5499d authored by Rafaël Carré's avatar Rafaël Carré

schroedinger: use VLC_TS_INVALID (refs #3135)

parent 76ed5901
...@@ -111,7 +111,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -111,7 +111,7 @@ static int OpenDecoder( vlc_object_t *p_this )
p_dec->p_sys = p_sys; p_dec->p_sys = p_sys;
p_sys->p_schro = p_schro; p_sys->p_schro = p_schro;
p_sys->p_format = NULL; p_sys->p_format = NULL;
p_sys->i_lastpts = -1; p_sys->i_lastpts = VLC_TS_INVALID;
p_sys->i_frame_pts_delta = 0; p_sys->i_frame_pts_delta = 0;
/* Set output properties */ /* Set output properties */
...@@ -299,7 +299,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -299,7 +299,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY ) { if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY ) {
schro_decoder_reset( p_sys->p_schro ); schro_decoder_reset( p_sys->p_schro );
p_sys->i_lastpts = -1; p_sys->i_lastpts = VLC_TS_INVALID;
block_Release( p_block ); block_Release( p_block );
*pp_block = NULL; *pp_block = NULL;
return NULL; return NULL;
...@@ -309,7 +309,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -309,7 +309,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_schrobuffer = schro_buffer_new_with_data( p_block->p_buffer, p_block->i_buffer ); p_schrobuffer = schro_buffer_new_with_data( p_block->p_buffer, p_block->i_buffer );
p_schrobuffer->free = SchroBufferFree; p_schrobuffer->free = SchroBufferFree;
p_schrobuffer->priv = p_block; p_schrobuffer->priv = p_block;
if( p_block->i_pts != VLC_TS_INVALID ) { if( p_block->i_pts > VLC_TS_INVALID ) {
mtime_t *p_pts = malloc( sizeof(*p_pts) ); mtime_t *p_pts = malloc( sizeof(*p_pts) );
if( p_pts ) { if( p_pts ) {
*p_pts = p_block->i_pts; *p_pts = p_block->i_pts;
...@@ -372,7 +372,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -372,7 +372,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_pic->date = *(mtime_t*) p_tag->value; p_pic->date = *(mtime_t*) p_tag->value;
schro_tag_free( p_tag ); schro_tag_free( p_tag );
} }
else if( p_sys->i_lastpts >= 0 ) else if( p_sys->i_lastpts > VLC_TS_INVALID )
{ {
/* NB, this shouldn't happen since the packetizer does a /* NB, this shouldn't happen since the packetizer does a
* very thorough job of inventing timestamps. The * very thorough job of inventing timestamps. The
......
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