Skip to content

V
vlc
Commit 9002730f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

mkv: fix call to ES_OUT_SET_NEXT_DISPLAY_TIME

parent 9aef14d5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/demux/mkv/matroska_segment.cpp
View file @ 9002730f
...@@ -830,12 +830,11 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_ ...@@ -830,12 +830,11 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_
} }
} }
#if !defined(WIN32) && !defined(__ANDROID__) && !defined(__APPLE__) && \
!defined(__OS2__)
/* Don't try complex seek if we seek to 0 */ /* Don't try complex seek if we seek to 0 */
if( i_date == 0 && i_time_offset == 0 ) if( i_date == 0 && i_time_offset == 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 );
...@@ -847,7 +846,6 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset, int64_t i_ ...@@ -847,7 +846,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