Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
9002730f
Commit
9002730f
authored
Oct 30, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mkv: fix call to ES_OUT_SET_NEXT_DISPLAY_TIME
parent
9aef14d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
modules/demux/mkv/matroska_segment.cpp
modules/demux/mkv/matroska_segment.cpp
+2
-4
No files found.
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_
}
}
#if !defined(WIN32) && !defined(__ANDROID__) && !defined(__APPLE__) && \
!defined(__OS2__)
/* Don't try complex seek if we seek to 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
.
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_
sys
.
i_pcr
=
0
;
return
;
}
#endif
int
i_idx
=
0
;
if
(
i_index
>
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment