Commit 3ce813b2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

mkv: fix call to ES_OUT_SET_NEXT_DISPLAY_TIME

(cherry picked from commit 9002730fbd83123aae1f69f162e4275f595f9f9e)

Conflicts:
	modules/demux/mkv/matroska_segment.cpp
parent 9bc5a114
...@@ -728,11 +728,11 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_ ...@@ -728,11 +728,11 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
} }
} }
#ifndef WIN32
/* Don't try complex seek if we seek to 0 */ /* Don't try complex seek if we seek to 0 */
if( i_date == 0 ) if( i_date == 0 )
{ {
es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, 0 ); es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME,
INT64_C(0) );
es_out_Control( sys.demuxer.out, ES_OUT_SET_PCR, VLC_TS_0 ); es_out_Control( sys.demuxer.out, ES_OUT_SET_PCR, VLC_TS_0 );
es.I_O().setFilePointer( i_start_pos ); es.I_O().setFilePointer( i_start_pos );
...@@ -744,7 +744,6 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_ ...@@ -744,7 +744,6 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
sys.i_pcr = 0; sys.i_pcr = 0;
return; return;
} }
#endif
int i_idx = 0; int i_idx = 0;
if ( i_index > 0 ) if ( i_index > 0 )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment