# HG changeset patch
# User Praveen Tiwari <[email protected]>
# Date 1457444337 -19800
# Tue Mar 08 19:08:57 2016 +0530
# Node ID 0e1b6472c05e3a53538d8e064e502d8a7508eb6e
# Parent d50663b272c4f308de6f669afe1323990971e08d
motion.cpp: optimization, eliminate branching
diff -r d50663b272c4 -r 0e1b6472c05e source/encoder/motion.cpp
--- a/source/encoder/motion.cpp Tue Mar 08 15:50:05 2016 +0530
+++ b/source/encoder/motion.cpp Tue Mar 08 19:08:57 2016 +0530
@@ -30,6 +30,7 @@
#if _MSC_VER
#pragma warning(disable: 4127) // conditional expression is constant (macros
use this construct)
+#pragma warning (disable: 4706) // assignment within conditional expression
#endif
using namespace X265_NS;
@@ -762,8 +763,7 @@
ucost2 = bcost;
if (bmv.notZero() && bmv != pmv)
DIA1_ITER(bmv.x, bmv.y);
- if (bcost == ucost2)
- cross_start = 3;
+ (bcost == ucost2) && (cross_start = 3);
/* Early Termination */
omv = bmv;
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
