<div dir="ltr">Thanks. Pushed</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 30, 2017 at 10:49 PM, Ma0 <span dir="ltr"><<a href="mailto:mateuszb@poczta.onet.pl" target="_blank">mateuszb@poczta.onet.pl</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Ma0 <<a href="mailto:mateuszb@poczta.onet.pl">mateuszb@poczta.onet.pl</a>><br>
# Date 1512062200 -3600<br>
# Thu Nov 30 18:16:40 2017 +0100<br>
# Node ID 5e5fbf5ce96f0361f51f122ab43f3c<wbr>6369a79ad2<br>
# Parent b1dfa312234ed72c3541831a15f307<wbr>feaf79484d<br>
fix ambiguous call to overloaded function 'sqrt' (in old MSVC)<br>
<br>
diff -r b1dfa312234e -r 5e5fbf5ce96f source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Thu Nov 30 10:06:49 2017 +0530<br>
+++ b/source/encoder/encoder.cpp Thu Nov 30 18:16:40 2017 +0100<br>
@@ -575,7 +575,7 @@<br>
{<br>
int mv_x = ((analysis_inter_data *)curFrame->m_analysisData.<wbr>interData)->mv[k][(mbIndex * 16) + cuOffset].x;<br>
int mv_y = ((analysis_inter_data *)curFrame->m_analysisData.<wbr>interData)->mv[k][(mbIndex * 16) + cuOffset].y;<br>
- double mv = sqrt(mv_x*mv_x + mv_y*mv_y);<br>
+ double mv = sqrt((double)(mv_x*mv_x + mv_y*mv_y));<br>
if (numPU == PU_2Nx2N && ((srcInterData)->depth[cuPos + cuOffset] == (m_param->maxCUSize >> 5)) && mv <= MVTHRESHOLD)<br>
memset(&curFrame->m_<wbr>analysisData.modeFlag[k][cuPos + cuOffset], 1, bytes);<br>
}<br>
@@ -658,7 +658,7 @@<br>
{<br>
int mv_x = ((analysis_inter_data *)curFrame->m_analysisData.<wbr>interData)->mv[i][count + pu].x;<br>
int mv_y = ((analysis_inter_data *)curFrame->m_analysisData.<wbr>interData)->mv[i][count + pu].y;<br>
- double mv = sqrt(mv_x*mv_x + mv_y*mv_y);<br>
+ double mv = sqrt((double)(mv_x*mv_x + mv_y*mv_y));<br>
if (numPU == PU_2Nx2N && m_param->num4x4Partitions <= 16 && mv <= MVTHRESHOLD)<br>
memset(&curFrame->m_<wbr>analysisData.modeFlag[i][count + pu], 1, bytes);<br>
}<br>
______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/<wbr>listinfo/x265-devel</a><br>
</blockquote></div><br></div>