vlc | branch: master | Zhao Zhili <[email protected]> | Sun May 27 23:09:32 2018 +0800| [d621b278b975dbd656fb76da157b27f079662cb8] | committer: Steve Lhomme
demux: mkv: simplify string operation Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d621b278b975dbd656fb76da157b27f079662cb8 --- modules/demux/mkv/matroska_segment_parse.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp index 6aafe8f552..1e6c38f719 100644 --- a/modules/demux/mkv/matroska_segment_parse.cpp +++ b/modules/demux/mkv/matroska_segment_parse.cpp @@ -1187,18 +1187,16 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap } E_CASE( KaxChapterString, name ) { - char *psz_tmp_utf8 = ToUTF8( UTFstring( name ) ); + std::string str_name( UTFstring( name ).GetUTF8() ); for ( int k = 0; k < vars.i_level; k++) vars.chapters.str_name += '+'; vars.chapters.str_name += ' '; - vars.chapters.str_name += psz_tmp_utf8; + vars.chapters.str_name += str_name; vars.chapters.b_user_display = true; - debug( vars, "ChapterString=%s", psz_tmp_utf8 ); - - free( psz_tmp_utf8 ); + debug( vars, "ChapterString=%s", str_name.c_str() ); } E_CASE( KaxChapterLanguage, lang ) { @@ -1286,9 +1284,7 @@ void matroska_segment_c::ParseAttachments( KaxAttachments *attachments ) while( attachedFile && ( attachedFile->GetSize() > 0 ) ) { KaxFileData &img_data = GetChild<KaxFileData>( *attachedFile ); - char *psz_tmp_utf8 = ToUTF8( UTFstring( GetChild<KaxFileName>( *attachedFile ) ) ); - std::string attached_filename(psz_tmp_utf8); - free(psz_tmp_utf8); + std::string attached_filename( UTFstring( GetChild<KaxFileName>( *attachedFile ) ).GetUTF8() ); attachment_c *new_attachment = new attachment_c( attached_filename, GetChild<KaxMimeType>( *attachedFile ), img_data.GetSize() ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
