Commit b9188c54 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Rémi Duraffort

MKV: Use new vlc_delete_all to clear containers.

Signed-off-by: default avatarRémi Duraffort <ivoire@videolan.org>
parent a1a0cafb
...@@ -28,18 +28,8 @@ ...@@ -28,18 +28,8 @@
chapter_item_c::~chapter_item_c() chapter_item_c::~chapter_item_c()
{ {
std::vector<chapter_codec_cmds_c*>::iterator index = codecs.begin(); vlc_delete_all( codecs );
while ( index != codecs.end() ) vlc_delete_all( sub_chapters );
{
delete (*index);
++index;
}
std::vector<chapter_item_c*>::iterator index_ = sub_chapters.begin();
while ( index_ != sub_chapters.end() )
{
delete (*index_);
++index_;
}
} }
int chapter_item_c::PublishChapters( input_title_t & title, int & i_user_chapters, int i_level ) int chapter_item_c::PublishChapters( input_title_t & title, int & i_user_chapters, int i_level )
......
...@@ -66,24 +66,9 @@ matroska_segment_c::~matroska_segment_c() ...@@ -66,24 +66,9 @@ matroska_segment_c::~matroska_segment_c()
delete p_prev_segment_uid; delete p_prev_segment_uid;
delete p_next_segment_uid; delete p_next_segment_uid;
std::vector<chapter_edition_c*>::iterator index = stored_editions.begin(); vlc_delete_all( stored_editions );
while ( index != stored_editions.end() ) vlc_delete_all( translations );
{ vlc_delete_all( families );
delete (*index);
++index;
}
std::vector<chapter_translation_c*>::iterator indext = translations.begin();
while ( indext != translations.end() )
{
delete (*indext);
++indext;
}
std::vector<KaxSegmentFamily*>::iterator indexf = families.begin();
while ( indexf != families.end() )
{
delete (*indexf);
++indexf;
}
} }
......
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