[x265] [PATCH 1 of 2] TEncSearch: Fix parameter type of xEstimateResidualQT

[Derek Buitenhuis]

# HG changeset patch
# User Derek Buitenhuis <derek.buitenhuis at gmail.com>
# Date 1384350763 0
# Node ID 1c8e8f6f66657bd09807707728b42689d571f881
# Parent  c4ca80d19105ccf1ba2ec14dd65915f2820a660d
TEncSearch: Fix parameter type of xEstimateResidualQT

Fixes compilation with g++.

diff -r c4ca80d19105 -r 1c8e8f6f6665 source/Lib/TLibEncoder/TEncSearch.cpp
--- a/source/Lib/TLibEncoder/TEncSearch.cpp	Tue Nov 12 19:10:23 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp	Wed Nov 13 13:52:43 2013 +0000
@@ -2809,7 +2809,7 @@
 
     //  Residual coding.
     int     qp, qpBest = 0;
-    UInt64  cost, bcost = MAX_INT64;
+    uint64_t cost, bcost = MAX_INT64;
 
     uint32_t trLevel = 0;
     if ((cu->getWidth(0) > cu->getSlice()->getSPS()->getMaxTrSize()))
@@ -3042,7 +3042,7 @@
                                      uint32_t       absTUPartIdx,
                                      TShortYUV*     resiYuv,
                                      const uint32_t depth,
-                                     UInt64 &       rdCost,
+                                     uint64_t &       rdCost,
                                      uint32_t &     outBits,
                                      uint32_t &     outDist,
                                      uint32_t *     outZeroDist,
@@ -3634,7 +3634,7 @@
         }
         uint32_t subdivDist = 0;
         uint32_t subdivBits = 0;
-        UInt64 subDivCost = 0;
+        uint64_t subDivCost = 0;
 
         const uint32_t qPartNumSubdiv = cu->getPic()->getNumPartInCU() >> ((depth + 1) << 1);
         for (uint32_t i = 0; i < 4; ++i)
diff -r c4ca80d19105 -r 1c8e8f6f6665 source/Lib/TLibEncoder/TEncSearch.h
--- a/source/Lib/TLibEncoder/TEncSearch.h	Tue Nov 12 19:10:23 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.h	Wed Nov 13 13:52:43 2013 +0000
@@ -250,7 +250,7 @@
 
     void xEncodeResidualQT(TComDataCU* cu, uint32_t absPartIdx, uint32_t depth, bool bSubdivAndCbf, TextType ttype);
     void xEstimateResidualQT(TComDataCU* cu, uint32_t absPartIdx, uint32_t absTUPartIdx, TShortYUV* resiYuv, uint32_t depth,
-                             UInt64 &rdCost, uint32_t &outBits, uint32_t &outDist, uint32_t *puiZeroDist, bool curUseRDOQ = true);
+                             uint64_t &rdCost, uint32_t &outBits, uint32_t &outDist, uint32_t *puiZeroDist, bool curUseRDOQ = true);
     void xSetResidualQTData(TComDataCU* cu, uint32_t absPartIdx, uint32_t absTUPartIdx, TShortYUV* resiYuv, uint32_t depth, bool bSpatial);
 
     void setWpScalingDistParam(TComDataCU* cu, int refIdx, int picList);