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

Fix warning on Windows about conversion from int to bool in convert util

Browse Source 
BUG=none
TEST=none
R=ryanpetrie@google.com

Review URL: https://webrtc-codereview.appspot.com/1579004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@702 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-05-28 18:53:47 +00:00
parent 380973cf19
commit 235011272a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 701
Version: 702
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 701
#define LIBYUV_VERSION 702
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

9
util/convert.cc
View File

@ -203,8 +203,8 @@ int main(int argc, const char* argv[]) {
}
}
bool org_is_yuv = strstr(argv[fileindex_org], "_P420.");
bool org_is_argb = strstr(argv[fileindex_org], "_ARGB.");
bool org_is_yuv = strstr(argv[fileindex_org], "_P420.") != NULL;
bool org_is_argb = strstr(argv[fileindex_org], "_ARGB.") != NULL;
if (!org_is_yuv && !org_is_argb) {
fprintf(stderr, "Original format unknown %s\n", argv[fileindex_org]);
exit(1);
@ -289,8 +289,9 @@ int main(int argc, const char* argv[]) {
dst_width, dst_height,
static_cast<libyuv::FilterMode>(filter));
}
bool rec_is_yuv = strstr(argv[fileindex_rec + cur_rec], "_P420.");
bool rec_is_argb = strstr(argv[fileindex_rec + cur_rec], "_ARGB.");
bool rec_is_yuv = strstr(argv[fileindex_rec + cur_rec], "_P420.") != NULL;
bool rec_is_argb =
strstr(argv[fileindex_rec + cur_rec], "_ARGB.") != NULL;
if (!rec_is_yuv && !rec_is_argb) {
fprintf(stderr, "Output format unknown %s\n",
argv[fileindex_rec + cur_rec]);