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
b7b09037
Commit
b7b09037
authored
Jun 12, 2007
by
Dennis van Amerongen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/demux/mkv.cpp: backport [20041], Fix im MKV demuxer.
parent
1ff768ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
THANKS
THANKS
+1
-0
modules/demux/mkv.cpp
modules/demux/mkv.cpp
+11
-1
No files found.
THANKS
View file @
b7b09037
...
@@ -73,6 +73,7 @@ Goetz Waschk <waschk at informatik.uni-rostock dot de> - Mandrake packages
...
@@ -73,6 +73,7 @@ Goetz Waschk <waschk at informatik.uni-rostock dot de> - Mandrake packages
Haakon Meland Eriksen - Norwegian translation
Haakon Meland Eriksen - Norwegian translation
Han HoJoong <0demon0 at paran dot com> - Korean translation
Han HoJoong <0demon0 at paran dot com> - Korean translation
Hans-Peter Jansen <hpj at urpla.net> - patch for module options handling
Hans-Peter Jansen <hpj at urpla.net> - patch for module options handling
Harry Sintonen <sintonen at iki dot fi> - fix for MKV demuxer
Ilkka Ollakka - SDP bitrate patch
Ilkka Ollakka - SDP bitrate patch
Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio
Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio
Jan Van Boghout <vlc at macrabbit.com> - iTunes like slider for OSX intf
Jan Van Boghout <vlc at macrabbit.com> - iTunes like slider for OSX intf
...
...
modules/demux/mkv.cpp
View file @
b7b09037
...
@@ -5599,13 +5599,23 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset )
...
@@ -5599,13 +5599,23 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset )
for
(
i_track
=
0
;
i_track
<
tracks
.
size
();
i_track
++
)
for
(
i_track
=
0
;
i_track
<
tracks
.
size
();
i_track
++
)
{
{
#if LIBMATROSKA_VERSION >= 0x000800
if
(
(
simpleblock
&&
tracks
[
i_track
]
->
i_number
==
simpleblock
->
TrackNum
())
||
(
block
&&
tracks
[
i_track
]
->
i_number
==
block
->
TrackNum
())
)
#else
if
(
tracks
[
i_track
]
->
i_number
==
block
->
TrackNum
()
)
if
(
tracks
[
i_track
]
->
i_number
==
block
->
TrackNum
()
)
#endif
{
{
break
;
break
;
}
}
}
}
sys
.
i_pts
=
(
sys
.
i_chapter_time
+
block
->
GlobalTimecode
())
/
(
mtime_t
)
1000
;
#if LIBMATROSKA_VERSION >= 0x000800
if
(
simpleblock
)
sys
.
i_pts
=
(
sys
.
i_chapter_time
+
simpleblock
->
GlobalTimecode
())
/
(
mtime_t
)
1000
;
else
#endif
sys
.
i_pts
=
(
sys
.
i_chapter_time
+
block
->
GlobalTimecode
())
/
(
mtime_t
)
1000
;
if
(
i_track
<
tracks
.
size
()
)
if
(
i_track
<
tracks
.
size
()
)
{
{
...
...
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