Fixed invalid/useless usage of ES_OUT_RESET_PCR.

[vlc] / modules / demux / mkv / mkv.cpp

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 338732ff5b1cbfb9fbfc686a5619d03dd2077564..2c1e96734567fb6ee9dff99c37972bb286eaef82 100644 (file)
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -649,7 +649,6 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
                 {
                     ParseCluster();
                     msg_Dbg( &sys.demuxer, "we found a cluster that is in the neighbourhood" );
-                    es_out_Control( sys.demuxer.out, ES_OUT_RESET_PCR );
                     return;
                 }
             }
@@ -690,8 +689,6 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
 
     sys.i_start_pts = i_date;
 
-    es_out_Control( sys.demuxer.out, ES_OUT_RESET_PCR );
-
     /* now parse until key frame */
     i_track_skipping = 0;
     for( i_track = 0; i_track < tracks.size(); i_track++ )
@@ -744,7 +741,6 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
                 }
                 if( !tracks[i_track]->b_search_keyframe )
                 {
-                    //es_out_Control( sys.demuxer.out, ES_OUT_SET_PCR, sys.i_pts );
                     BlockDecode( &sys.demuxer, block, simpleblock, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 );
                 }
             }
@@ -865,10 +861,10 @@ static int Demux( demux_t *p_demux)
         else
             p_sys->i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
 
+        es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts );
+
         if( p_sys->i_pts >= p_sys->i_start_pts  )
         {
-            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts );
-
             if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
             {
                 i_return = 1;