diff --git a/packager/hls/base/master_playlist.cc b/packager/hls/base/master_playlist.cc index 11582021f8..ae845550c3 100644 --- a/packager/hls/base/master_playlist.cc +++ b/packager/hls/base/master_playlist.cc @@ -438,7 +438,8 @@ bool PlaylistOrderFn(const MediaPlaylist*& a, const MediaPlaylist*& b) { } bool TagslistOrderFn(const MediaTagslist& a, const MediaTagslist& b) { - return a.playlist->GetMediaInfo().index() < b.playlist->GetMediaInfo().index(); + return a.playlist->GetMediaInfo().index() < + b.playlist->GetMediaInfo().index(); } void AppendPlaylists(const std::string& default_audio_language, @@ -446,8 +447,7 @@ void AppendPlaylists(const std::string& default_audio_language, const std::string& base_url, const std::list& playlists, std::string* content) { - std::map> - audio_playlist_groups; + std::map> audio_playlist_groups; std::map> subtitle_playlist_groups; std::list video_playlists; @@ -485,25 +485,27 @@ void AppendPlaylists(const std::string& default_audio_language, if (!audio_playlist_groups.empty()) { content->append("\n"); std::list audio_playlists = - BuildMediaTags(audio_playlist_groups, default_audio_language, base_url); + BuildMediaTags(audio_playlist_groups, default_audio_language, base_url); if (has_index) { audio_playlists.sort(TagslistOrderFn); } for (const auto& pl : audio_playlists) { - BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, base_url, content); + BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, + base_url, content); } } if (!subtitle_playlist_groups.empty()) { content->append("\n"); - std::list subtitle_playlists = - BuildMediaTags(subtitle_playlist_groups, default_text_language, base_url); + std::list subtitle_playlists = BuildMediaTags( + subtitle_playlist_groups, default_text_language, base_url); if (has_index) { subtitle_playlists.sort(TagslistOrderFn); } for (const auto& pl : subtitle_playlists) { - BuildMediaTag(*pl.playlist, pl.group_id, pl.is_default, pl.is_autoselect, base_url, content); + 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 8e859d1b1d..50f1e25ec0 100644 --- a/packager/media/formats/mp2t/es_parser_teletext.cc +++ b/packager/media/formats/mp2t/es_parser_teletext.cc @@ -278,7 +278,8 @@ bool EsParserTeletext::ParseDataBlock(const int64_t pts, } void EsParserTeletext::UpdateCharset() { - memcpy(current_charset_, TELETEXT_CHARSET_G0_LATIN, sizeof(TELETEXT_CHARSET_G0_LATIN)); + memcpy(current_charset_, TELETEXT_CHARSET_G0_LATIN, + sizeof(TELETEXT_CHARSET_G0_LATIN)); if (charset_code_ > 7) { return; }