[vlc-devel] commit: quicktime: use VLC_TS_INVALID (refs #3135) ( Rafaël Carré )

git version control git at videolan.org
Mon Dec 7 08:50:44 CET 2009


vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Dec  7 08:48:54 2009 +0100| [6aca0a671d9cc07923af2a8266168cb57b6abd6b] | committer: Rafaël Carré 

quicktime: use VLC_TS_INVALID (refs #3135)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6aca0a671d9cc07923af2a8266168cb57b6abd6b
---

 modules/codec/quicktime.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index 0bdb005..146c4f2 100644
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -618,7 +618,7 @@ static aout_buffer_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
                          p_sys->i_buffer );
             }
 
-            if( p_sys->pts != 0 &&
+            if( p_sys->pts > VLC_TS_INVALID &&
                 p_sys->pts != date_Get( &p_sys->date ) )
             {
                 date_Set( &p_sys->date, p_sys->pts );
@@ -897,7 +897,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
     p_block = *pp_block;
     *pp_block = NULL;
  
-    i_pts = p_block->i_pts ? p_block->i_pts : p_block->i_dts;
+    i_pts = p_block->i_pts > VLC_TS_INVALID ? p_block->i_pts : p_block->i_dts;
 
     mtime_t i_display_date = 0;
     if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) )




More information about the vlc-devel mailing list