Commit aaebd49a authored by Francois Cartegnie's avatar Francois Cartegnie

demux: mkv: fix type and c++ type cast

kills that signed / unsigned comparison warning
parent afc2c72d
...@@ -122,7 +122,7 @@ public: ...@@ -122,7 +122,7 @@ public:
/* when you remove this variable the compiler issues an atomicity error */ /* when you remove this variable the compiler issues an atomicity error */
/* this variable only works when using std::vector<chapter_edition_c> */ /* this variable only works when using std::vector<chapter_edition_c> */
std::vector<chapter_edition_c*> stored_editions; 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<chapter_translation_c*> translations;
std::vector<KaxSegmentFamily*> families; std::vector<KaxSegmentFamily*> families;
......
...@@ -261,7 +261,7 @@ void virtual_edition_c::retimeChapters() ...@@ -261,7 +261,7 @@ void virtual_edition_c::retimeChapters()
virtual_segment_c::virtual_segment_c( std::vector<matroska_segment_c*> * p_opened_segments ) virtual_segment_c::virtual_segment_c( std::vector<matroska_segment_c*> * p_opened_segments )
{ {
/* Main segment */ /* Main segment */
size_t i; std::vector<chapter_edition_c*>::size_type i;
matroska_segment_c *p_segment = (*p_opened_segments)[0]; matroska_segment_c *p_segment = (*p_opened_segments)[0];
i_current_edition = 0; i_current_edition = 0;
i_sys_title = 0; i_sys_title = 0;
......
...@@ -114,14 +114,14 @@ public: ...@@ -114,14 +114,14 @@ public:
virtual_segment_c( std::vector<matroska_segment_c*> * opened_segments ); virtual_segment_c( std::vector<matroska_segment_c*> * opened_segments );
~virtual_segment_c(); ~virtual_segment_c();
std::vector<virtual_edition_c*> editions; 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; virtual_chapter_c *p_current_chapter;
int i_sys_title; int i_sys_title;
inline virtual_edition_c * CurrentEdition() 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 editions[i_current_edition];
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment