mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2026-02-12 21:29:51 +08:00
Fix warning on Windows about conversion from int to bool in convert util
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:
parent
380973cf19
commit
235011272a
@ -1,6 +1,6 @@
|
|||||||
Name: libyuv
|
Name: libyuv
|
||||||
URL: http://code.google.com/p/libyuv/
|
URL: http://code.google.com/p/libyuv/
|
||||||
Version: 701
|
Version: 702
|
||||||
License: BSD
|
License: BSD
|
||||||
License File: LICENSE
|
License File: LICENSE
|
||||||
|
|
||||||
|
|||||||
@ -11,6 +11,6 @@
|
|||||||
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
|
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
|
||||||
#define INCLUDE_LIBYUV_VERSION_H_
|
#define INCLUDE_LIBYUV_VERSION_H_
|
||||||
|
|
||||||
#define LIBYUV_VERSION 701
|
#define LIBYUV_VERSION 702
|
||||||
|
|
||||||
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
|
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
|
||||||
|
|||||||
@ -203,8 +203,8 @@ int main(int argc, const char* argv[]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool org_is_yuv = strstr(argv[fileindex_org], "_P420.");
|
bool org_is_yuv = strstr(argv[fileindex_org], "_P420.") != NULL;
|
||||||
bool org_is_argb = strstr(argv[fileindex_org], "_ARGB.");
|
bool org_is_argb = strstr(argv[fileindex_org], "_ARGB.") != NULL;
|
||||||
if (!org_is_yuv && !org_is_argb) {
|
if (!org_is_yuv && !org_is_argb) {
|
||||||
fprintf(stderr, "Original format unknown %s\n", argv[fileindex_org]);
|
fprintf(stderr, "Original format unknown %s\n", argv[fileindex_org]);
|
||||||
exit(1);
|
exit(1);
|
||||||
@ -289,8 +289,9 @@ int main(int argc, const char* argv[]) {
|
|||||||
dst_width, dst_height,
|
dst_width, dst_height,
|
||||||
static_cast<libyuv::FilterMode>(filter));
|
static_cast<libyuv::FilterMode>(filter));
|
||||||
}
|
}
|
||||||
bool rec_is_yuv = strstr(argv[fileindex_rec + cur_rec], "_P420.");
|
bool rec_is_yuv = strstr(argv[fileindex_rec + cur_rec], "_P420.") != NULL;
|
||||||
bool rec_is_argb = strstr(argv[fileindex_rec + cur_rec], "_ARGB.");
|
bool rec_is_argb =
|
||||||
|
strstr(argv[fileindex_rec + cur_rec], "_ARGB.") != NULL;
|
||||||
if (!rec_is_yuv && !rec_is_argb) {
|
if (!rec_is_yuv && !rec_is_argb) {
|
||||||
fprintf(stderr, "Output format unknown %s\n",
|
fprintf(stderr, "Output format unknown %s\n",
|
||||||
argv[fileindex_rec + cur_rec]);
|
argv[fileindex_rec + cur_rec]);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user