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
22152f57
Commit
22152f57
authored
Feb 24, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Feb 24, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MKV: less strict warning of normal situations
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
150c23b0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
modules/demux/mkv/Ebml_parser.cpp
modules/demux/mkv/Ebml_parser.cpp
+2
-2
No files found.
modules/demux/mkv/Ebml_parser.cpp
View file @
22152f57
...
@@ -102,7 +102,7 @@ EbmlElement* EbmlParser::UnGet( uint64 i_block_pos, uint64 i_cluster_pos )
...
@@ -102,7 +102,7 @@ EbmlElement* EbmlParser::UnGet( uint64 i_block_pos, uint64 i_cluster_pos )
void
EbmlParser
::
Up
(
void
)
void
EbmlParser
::
Up
(
void
)
{
{
if
(
mi_user_level
==
mi_level
)
if
(
mi_user_level
==
mi_level
&&
m_el
[
mi_level
]
)
{
{
msg_Warn
(
p_demux
,
"MKV/Ebml Parser: Up cannot escape itself"
);
msg_Warn
(
p_demux
,
"MKV/Ebml Parser: Up cannot escape itself"
);
}
}
...
@@ -232,7 +232,7 @@ EbmlElement *EbmlParser::Get( int n_call )
...
@@ -232,7 +232,7 @@ EbmlElement *EbmlParser::Get( int n_call )
}
}
else
if
(
m_el
[
mi_level
]
==
NULL
)
else
if
(
m_el
[
mi_level
]
==
NULL
)
{
{
msg_
Warn
(
p_demux
,
"MKV/Ebml Parser: m_el[mi_level] == NULL
\n
"
);
msg_
Dbg
(
p_demux
,
"MKV/Ebml Parser: m_el[mi_level] == NULL
"
);
}
}
else
if
(
m_el
[
mi_level
]
->
IsDummy
()
&&
!
mb_dummy
)
else
if
(
m_el
[
mi_level
]
->
IsDummy
()
&&
!
mb_dummy
)
{
{
...
...
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