Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
9fcf9eff
Commit
9fcf9eff
authored
Jan 30, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mkv: use MKV_IS_ID and avoid EbmlId() operator use
parent
13735a5a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
modules/demux/mkv/demux.cpp
modules/demux/mkv/demux.cpp
+1
-1
modules/demux/mkv/matroska_segment_parse.cpp
modules/demux/mkv/matroska_segment_parse.cpp
+1
-1
No files found.
modules/demux/mkv/demux.cpp
View file @
9fcf9eff
...
@@ -94,7 +94,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
...
@@ -94,7 +94,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
while
(
p_l0
!=
0
)
while
(
p_l0
!=
0
)
{
{
if
(
EbmlId
(
*
p_l0
)
==
KaxSegment
::
ClassInfos
.
GlobalId
)
if
(
MKV_IS_ID
(
p_l0
,
KaxSegment
)
)
{
{
EbmlParser
*
ep
;
EbmlParser
*
ep
;
matroska_segment_c
*
p_segment1
=
new
matroska_segment_c
(
*
this
,
*
p_estream
);
matroska_segment_c
*
p_segment1
=
new
matroska_segment_c
(
*
this
,
*
p_estream
);
...
...
modules/demux/mkv/matroska_segment_parse.cpp
View file @
9fcf9eff
...
@@ -539,7 +539,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
...
@@ -539,7 +539,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
tk
->
f_fps
=
float
(
vfps
);
tk
->
f_fps
=
float
(
vfps
);
msg_Dbg
(
&
sys
.
demuxer
,
" | | | + fps=%f"
,
float
(
vfps
)
);
msg_Dbg
(
&
sys
.
demuxer
,
" | | | + fps=%f"
,
float
(
vfps
)
);
}
}
else
if
(
EbmlId
(
*
l
)
==
KaxVideoDisplayUnit
::
ClassInfos
.
GlobalId
)
else
if
(
MKV_IS_ID
(
l
,
KaxVideoDisplayUnit
)
)
{
{
KaxVideoDisplayUnit
&
vdmode
=
*
(
KaxVideoDisplayUnit
*
)
l
;
KaxVideoDisplayUnit
&
vdmode
=
*
(
KaxVideoDisplayUnit
*
)
l
;
...
...
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