Used VLC_TS_INVALID/0 in mkv demuxer.

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 97297795fb530a670c1078e9a4b6753cb5cc7b97..4508293306928f185a8ee6747e63ecfb447b1fee 100644 (file)
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -580,7 +580,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simp
         {
             if( tk->b_dts_only )
             {
-                p_block->i_pts = 0;
+                p_block->i_pts = VLC_TS_INVALID;
                 p_block->i_dts = i_pts;
             }
             else
@@ -604,15 +604,15 @@ msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_b
         }
 
         /* FIXME remove when VLC_TS_INVALID work is done */
-        if( i == 0 || p_block->i_dts > 0 )
-            p_block->i_dts++;
-        if( !tk->b_dts_only && ( i == 0 || p_block->i_pts ) )
-            p_block->i_pts++;
+        if( i == 0 || p_block->i_dts > VLC_TS_INVALID )
+            p_block->i_dts += VLC_TS_0;
+        if( !tk->b_dts_only && ( i == 0 || p_block->i_pts > VLC_TS_INVALID ) )
+            p_block->i_pts += VLC_TS_0;
 
         es_out_Send( p_demux->out, tk->p_es, p_block );
 
         /* use time stamp only for first block */
-        i_pts = 0;
+        i_pts = VLC_TS_INVALID;
     }
 }
 
@@ -865,8 +865,8 @@ static int Demux( demux_t *p_demux)
         else
             p_sys->i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
 
-        /* FIXME remove the +1 when VLC_TS_INVALID work is done */
-        es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts+1 );
+        /* */
+        es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pts );
 
         if( p_sys->i_pts >= p_sys->i_start_pts  )
         {