coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-08 01:36:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll to new chrome for vs2012 builds and fix a warning on vs2012

Browse Source 
BUG=125
TESTED=local build with gtest errors disabled
Review URL: https://webrtc-codereview.appspot.com/924004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@433 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2012-10-22 16:15:25 +00:00
parent 1982d2b877
commit 7411455932
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEPS
View File

@ -12,7 +12,7 @@ vars = {
# If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn",
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
"chromium_revision": "152335",
"chromium_revision": "163202",
}
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
@ -24,6 +24,10 @@ deps = {
"build":
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
# Needed by common.gypi.
"google_apis/build":
Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"),
"testing":
Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 430
Version: 433
License: BSD
License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 430
#define LIBYUV_VERSION 433
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

4
util/compare.cc
View File

@ -38,10 +38,10 @@ int main(int argc, char** argv) {
int amt1 = 0;
int amt2 = 0;
do {
amt1 = fread(buf1, 1, kBlockSize, fin1);
amt1 = static_cast<int>(fread(buf1, 1, kBlockSize, fin1));
if (amt1 > 0) hash1 = libyuv::HashDjb2(buf1, amt1, hash1);
if (fin2) {
amt2 = fread(buf2, 1, kBlockSize, fin2);
amt2 = static_cast<int>(fread(buf2, 1, kBlockSize, fin2));
if (amt2 > 0) hash2 = libyuv::HashDjb2(buf2, amt2, hash2);
int amt_min = (amt1 < amt2) ? amt1 : amt2;
size_min += amt_min;