# HG changeset patch # User Pradeep Ramachandran <prad...@multicorewareinc.com> # Date 1511237416 -19800 # Tue Nov 21 09:40:16 2017 +0530 # Node ID dae558b40d9901d5498bb989c96ae8acc5b63cdf # Parent a7c2f80c18afa0deff2c5b18897f5b3ebf70657c warn: Fix warning from analysis.cpp
diff -r a7c2f80c18af -r dae558b40d99 source/encoder/analysis.cpp --- a/source/encoder/analysis.cpp Mon Nov 20 14:31:22 2017 +0530 +++ b/source/encoder/analysis.cpp Tue Nov 21 09:40:16 2017 +0530 @@ -2000,7 +2000,8 @@ } /* Step 1. Evaluate Merge/Skip candidates for likely early-outs */ - if (mightNotSplit && !md.bestMode && !bCtuInfoCheck || (m_param->bMVType && (m_modeFlag[0] || m_modeFlag[1]))) + if ((mightNotSplit && !md.bestMode && !bCtuInfoCheck) || + (m_param->bMVType && (m_modeFlag[0] || m_modeFlag[1]))) { md.pred[PRED_SKIP].cu.initSubCU(parentCTU, cuGeom, qp); md.pred[PRED_MERGE].cu.initSubCU(parentCTU, cuGeom, qp); _______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel