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
bf6f6714
Commit
bf6f6714
authored
Mar 16, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Mar 16, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MKV: don't use i_last_dts if it's invalid
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
70d44c22
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
modules/demux/mkv/mkv.cpp
modules/demux/mkv/mkv.cpp
+2
-0
No files found.
modules/demux/mkv/mkv.cpp
View file @
bf6f6714
...
...
@@ -671,6 +671,8 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
// condition when the DTS is correct (keyframe or B frame == NOT P frame)
if
(
b_key_picture
||
b_discardable_picture
)
p_block
->
i_dts
=
p_block
->
i_pts
;
else
if
(
tk
->
i_last_dts
==
VLC_TS_INVALID
)
p_block
->
i_dts
=
i_pts
;
else
p_block
->
i_dts
=
min
(
i_pts
,
tk
->
i_last_dts
+
(
mtime_t
)
tk
->
i_default_duration
);
}
...
...
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