Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for reported build break. 

Fix for broken unit test on 32-bit platforms.

Change-Id: Ie9c314b4ea14be2cb3e51c8b06374b22ffdf9200
This commit is contained in:
Thomas Inskip 2014-07-01 10:26:43 -07:00
parent 79d3c4f4ec
commit b3d7e7db93
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/base/muxer_util.cc
View File

@ -145,8 +145,8 @@ std::string GetSegmentName(const std::string& segment_template,
segment_name += segment_name +=
base::StringPrintf(format_tag.c_str(), segment_start_time); base::StringPrintf(format_tag.c_str(), segment_start_time);
} else if (identifier == "Bandwidth") { } else if (identifier == "Bandwidth") {
segment_name += segment_name += base::StringPrintf(
base::StringPrintf(format_tag.c_str(), bandwidth); format_tag.c_str(), static_cast<uint64>(bandwidth));
} }
} }
return segment_name; return segment_name;

9
media/file/udp_file.cc
View File

@ -6,14 +6,15 @@
#include "media/file/udp_file.h" #include "media/file/udp_file.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "gflags/gflags.h"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <strings.h> #include <strings.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h>
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "gflags/gflags.h"
// TODO(tinskip): Adapt to work with winsock. // TODO(tinskip): Adapt to work with winsock.