diff --git a/media/base/muxer_util.cc b/media/base/muxer_util.cc index 10a0c49fb7..1c1ccca723 100644 --- a/media/base/muxer_util.cc +++ b/media/base/muxer_util.cc @@ -145,8 +145,8 @@ std::string GetSegmentName(const std::string& segment_template, segment_name += base::StringPrintf(format_tag.c_str(), segment_start_time); } else if (identifier == "Bandwidth") { - segment_name += - base::StringPrintf(format_tag.c_str(), bandwidth); + segment_name += base::StringPrintf( + format_tag.c_str(), static_cast(bandwidth)); } } return segment_name; diff --git a/media/file/udp_file.cc b/media/file/udp_file.cc index 81911d47b6..77dd7306fa 100644 --- a/media/file/udp_file.cc +++ b/media/file/udp_file.cc @@ -6,14 +6,15 @@ #include "media/file/udp_file.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "gflags/gflags.h" - #include #include #include #include +#include + +#include "base/logging.h" +#include "base/strings/string_number_conversions.h" +#include "gflags/gflags.h" // TODO(tinskip): Adapt to work with winsock.