vlc | branch: master | Filip Roséen <[email protected]> | Mon May 9 14:53:05 2016 +0200| [16192e7b56b83eae35e3cd0f3b95be4e2809fda0] | committer: Jean-Baptiste Kempf
mkv: removed unnecessary call to es_out_Control We are always calling matroska_segment_c::Seek after this function (matroska_segment_c::Select) is called, as such there is absolutely no need for us to explicitly invoke ES_OUT_SET_NEXT_DISPLAY_TIME (since this will happen implicitly later). Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16192e7b56b83eae35e3cd0f3b95be4e2809fda0 --- modules/demux/mkv/matroska_segment.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp index 017db2c..db45b04 100644 --- a/modules/demux/mkv/matroska_segment.cpp +++ b/modules/demux/mkv/matroska_segment.cpp @@ -956,13 +956,6 @@ bool matroska_segment_c::Select( mtime_t i_mk_start_time ) es_out_Control( sys.demuxer.out, ES_OUT_SET_ES_DEFAULT, track.p_es ); } } - es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, i_mk_start_time ); - - sys.i_start_pts = i_mk_start_time + VLC_TS_0; - // reset the stream reading to the first cluster of the segment used - es.I_O().setFilePointer( 0 /* previously i_start_pos */ ); - - ep->reconstruct( &es, segment, &sys.demuxer ); return true; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
