[x265-commits] [x265] pixel: prevent msvc warning
Steve Borho
steve at borho.org
Tue Jun 17 03:33:10 CEST 2014
details: http://hg.videolan.org/x265/rev/f25ed8618509
branches:
changeset: 7074:f25ed8618509
user: Steve Borho <steve at borho.org>
date: Mon Jun 16 20:32:13 2014 -0500
description:
pixel: prevent msvc warning
diffstat:
source/common/pixel.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diffs (14 lines):
diff -r 6d8d8c18ba28 -r f25ed8618509 source/common/pixel.cpp
--- a/source/common/pixel.cpp Sun Jun 15 20:10:30 2014 +0900
+++ b/source/common/pixel.cpp Mon Jun 16 20:32:13 2014 -0500
@@ -710,6 +710,10 @@ uint64_t pixel_var(pixel *pix, intptr_t
return sum + ((uint64_t)sqr << 32);
}
+#if defined(_MSC_VER)
+#pragma warning(disable: 4127) // conditional expression is constant
+#endif
+
template<int size>
int psyCost(pixel *source, intptr_t sstride, pixel *recon, intptr_t rstride)
{
More information about the x265-commits
mailing list