diff --git a/packager/media/base/fourccs.h b/packager/media/base/fourccs.h
index fe48203a13f..b075d5a3063 100644
--- a/packager/media/base/fourccs.h
+++ b/packager/media/base/fourccs.h
@@ -152,9 +152,9 @@ enum FourCC : uint32_t {
   FOURCC_trex = 0x74726578,
   FOURCC_trun = 0x7472756e,
   FOURCC_udta = 0x75647461,
-  FOURCC_udts = 0x75647473, // "udts"
-  FOURCC_url = 0x75726c20,  // "url "
-  FOURCC_urn = 0x75726e20,  // "urn "
+  FOURCC_udts = 0x75647473,  // "udts"
+  FOURCC_url = 0x75726c20,   // "url "
+  FOURCC_urn = 0x75726e20,   // "urn "
   FOURCC_uuid = 0x75756964,
   FOURCC_vide = 0x76696465,
   FOURCC_vlab = 0x766c6162,
diff --git a/packager/media/codecs/dts_audio_specific_config.cc b/packager/media/codecs/dts_audio_specific_config.cc
index a26b03dd340..dab138b934f 100644
--- a/packager/media/codecs/dts_audio_specific_config.cc
+++ b/packager/media/codecs/dts_audio_specific_config.cc
@@ -4,7 +4,6 @@
 
 #include "packager/media/codecs/dts_audio_specific_config.h"
 
-
 #include "packager/base/logging.h"
 #include "packager/media/base/bit_reader.h"
 #include "packager/media/base/rcheck.h"
@@ -12,7 +11,7 @@
 namespace shaka {
 namespace media {
 
-bool GetDTSXChannelMask(const std::vector<uint8_t> &udts, uint32_t &mask) {
+bool GetDTSXChannelMask(const std::vector<uint8_t>& udts, uint32_t& mask) {
   // udts is the DTS-UHD Specific Box: ETSI TS 103 491 V1.2.1 Table B-2
   // DecoderProfileCode(6 bits)
   // FrameDurationCode(2 bits)
diff --git a/packager/media/codecs/dts_audio_specific_config.h b/packager/media/codecs/dts_audio_specific_config.h
index f36e10c66f8..49b94c14ccb 100644
--- a/packager/media/codecs/dts_audio_specific_config.h
+++ b/packager/media/codecs/dts_audio_specific_config.h
@@ -15,7 +15,7 @@ namespace media {
 
 class BitReader;
 
-bool GetDTSXChannelMask(const std::vector<uint8_t> &udts, uint32_t &mask);
+bool GetDTSXChannelMask(const std::vector<uint8_t>& udts, uint32_t& mask);
 
 }  // namespace media
 }  // namespace shaka
diff --git a/packager/mpd/base/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc
index 73db7629d30..cfb21c424bd 100644
--- a/packager/mpd/base/xml/xml_node.cc
+++ b/packager/mpd/base/xml/xml_node.cc
@@ -619,15 +619,15 @@ bool RepresentationXmlNode::AddAudioChannelInfo(const AudioInfo& audio_info) {
              audio_info.codec() == kDTSECodec) {
     audio_channel_config_value = base::UintToString(audio_info.num_channels());
     audio_channel_config_scheme =
-      "tag:dts.com,2014:dash:audio_channel_configuration:2012";
+        "tag:dts.com,2014:dash:audio_channel_configuration:2012";
   } else if (audio_info.codec() == kDTSXCodec) {
     const auto& codec_data = audio_info.codec_specific_data();
     const uint32_t channel_config =
-      base::HostToNet32(codec_data.channel_mask());
+        base::HostToNet32(codec_data.channel_mask());
     audio_channel_config_value =
-      base::HexEncode(&channel_config, sizeof(channel_config));
+        base::HexEncode(&channel_config, sizeof(channel_config));
     audio_channel_config_scheme =
-      "tag:dts.com,2018:uhd:audio_channel_configuration";
+        "tag:dts.com,2018:uhd:audio_channel_configuration";
   } else {
     audio_channel_config_value =
         absl::StrFormat("%u", audio_info.num_channels());