vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Mon Mar 16 09:20:47 2015 +0100| [e964b1d65ff4667062282ad3f5c394713aa6490f] | committer: Jean-Baptiste Kempf
MKV: no need to shift the dts/pts twice in some cases anymore Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e964b1d65ff4667062282ad3f5c394713aa6490f --- modules/demux/mkv/mkv.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index dfb59d9..0ee557d 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -692,12 +692,6 @@ msg_Dbg( p_demux, "block (track=%d) i_dts: %"PRId64" / i_pts: %"PRId64, tk->i_nu (double) p_segment->i_timescale / ( 1000.0 * i_number_frames ); } - /* FIXME remove when VLC_TS_INVALID work is done */ - if( i_frame == 0 || p_block->i_dts > VLC_TS_INVALID ) - p_block->i_dts += VLC_TS_0; - if( !tk->b_dts_only && ( i_frame == 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 */ _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
