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
aaebd49a
Commit
aaebd49a
authored
Sep 26, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mkv: fix type and c++ type cast
kills that signed / unsigned comparison warning
parent
afc2c72d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
modules/demux/mkv/matroska_segment.hpp
modules/demux/mkv/matroska_segment.hpp
+1
-1
modules/demux/mkv/virtual_segment.cpp
modules/demux/mkv/virtual_segment.cpp
+1
-1
modules/demux/mkv/virtual_segment.hpp
modules/demux/mkv/virtual_segment.hpp
+2
-2
No files found.
modules/demux/mkv/matroska_segment.hpp
View file @
aaebd49a
...
...
@@ -122,7 +122,7 @@ public:
/* when you remove this variable the compiler issues an atomicity error */
/* this variable only works when using std::vector<chapter_edition_c> */
std
::
vector
<
chapter_edition_c
*>
stored_editions
;
int
i_default_edition
;
std
::
vector
<
chapter_edition_c
*>::
size_type
i_default_edition
;
std
::
vector
<
chapter_translation_c
*>
translations
;
std
::
vector
<
KaxSegmentFamily
*>
families
;
...
...
modules/demux/mkv/virtual_segment.cpp
View file @
aaebd49a
...
...
@@ -261,7 +261,7 @@ void virtual_edition_c::retimeChapters()
virtual_segment_c
::
virtual_segment_c
(
std
::
vector
<
matroska_segment_c
*>
*
p_opened_segments
)
{
/* Main segment */
s
ize_t
i
;
s
td
::
vector
<
chapter_edition_c
*>::
size_type
i
;
matroska_segment_c
*
p_segment
=
(
*
p_opened_segments
)[
0
];
i_current_edition
=
0
;
i_sys_title
=
0
;
...
...
modules/demux/mkv/virtual_segment.hpp
View file @
aaebd49a
...
...
@@ -114,14 +114,14 @@ public:
virtual_segment_c
(
std
::
vector
<
matroska_segment_c
*>
*
opened_segments
);
~
virtual_segment_c
();
std
::
vector
<
virtual_edition_c
*>
editions
;
int
i_current_edition
;
std
::
vector
<
virtual_edition_c
*>::
size_type
i_current_edition
;
virtual_chapter_c
*
p_current_chapter
;
int
i_sys_title
;
inline
virtual_edition_c
*
CurrentEdition
()
{
if
(
i_current_edition
>
=
0
&&
(
size_t
)
i_current_edition
<
editions
.
size
()
)
if
(
i_current_edition
>
0
&&
i_current_edition
<
editions
.
size
()
)
return
editions
[
i_current_edition
];
return
NULL
;
}
...
...
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