diff --git a/packager/hls/base/master_playlist.cc b/packager/hls/base/master_playlist.cc index ae845550c3..d83d6fe343 100644 --- a/packager/hls/base/master_playlist.cc +++ b/packager/hls/base/master_playlist.cc @@ -438,7 +438,7 @@ bool PlaylistOrderFn(const MediaPlaylist*& a, const MediaPlaylist*& b) { } bool TagslistOrderFn(const MediaTagslist& a, const MediaTagslist& b) { - return a.playlist->GetMediaInfo().index() < + return a.playlist->GetMediaInfo().index() < b.playlist->GetMediaInfo().index(); } @@ -490,7 +490,7 @@ void AppendPlaylists(const std::string& default_audio_language, audio_playlists.sort(TagslistOrderFn); } for (const auto& pl : audio_playlists) { - BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, + BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, base_url, content); } } @@ -504,7 +504,7 @@ void AppendPlaylists(const std::string& default_audio_language, subtitle_playlists.sort(TagslistOrderFn); } for (const auto& pl : subtitle_playlists) { - BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, + BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, base_url, content); } } diff --git a/packager/media/formats/mp2t/es_parser_teletext.cc b/packager/media/formats/mp2t/es_parser_teletext.cc index 50f1e25ec0..7aeb408bb3 100644 --- a/packager/media/formats/mp2t/es_parser_teletext.cc +++ b/packager/media/formats/mp2t/es_parser_teletext.cc @@ -278,7 +278,7 @@ bool EsParserTeletext::ParseDataBlock(const int64_t pts, } void EsParserTeletext::UpdateCharset() { - memcpy(current_charset_, TELETEXT_CHARSET_G0_LATIN, + memcpy(current_charset_, TELETEXT_CHARSET_G0_LATIN, sizeof(TELETEXT_CHARSET_G0_LATIN)); if (charset_code_ > 7) { return;