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

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


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

CC: use VLC_TS_INVALID (refs #3135)

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

 modules/codec/cc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index b53a84f..3e380f9 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -294,11 +294,11 @@ static block_t *Pop( decoder_t *p_dec )
         return NULL;
 
     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++ )
         {
-            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_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
     video_format_t fmt;
 
     /* 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" );
         return NULL;




More information about the vlc-devel mailing list