# HG changeset patch
# User Kavitha Sampath <[email protected]>
# Date 1527681605 -19800
# Wed May 30 17:30:05 2018 +0530
# Branch stable
# Node ID c9234756abe6f559201e2dec78688c50a939986d
# Parent e3ff1e578df3fd35d349363cde29856165921429
fix signed/unsigned mismatch warning in windows
diff -r e3ff1e578df3 -r c9234756abe6 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp Tue May 29 19:43:53 2018 +0530
+++ b/source/encoder/encoder.cpp Wed May 30 17:30:05 2018 +0530
@@ -3408,12 +3408,12 @@
allocAnalysis(analysis);
if (m_param->bDisableLookahead && m_rateControl->m_isVbv)
{
- uint64_t vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
+ size_t vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
X265_FREAD(analysis->lookahead.intraVbvCost, sizeof(uint32_t),
analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.intraVbvCost);
X265_FREAD(analysis->lookahead.vbvCost, sizeof(uint32_t),
analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.vbvCost);
X265_FREAD(analysis->lookahead.satdForVbv, sizeof(uint32_t),
analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.satdForVbv);
X265_FREAD(analysis->lookahead.intraSatdForVbv, sizeof(uint32_t),
analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.intraSatdForVbv);
- X265_FREAD(analysis->lookahead.plannedSatd, sizeof(uint64_t),
vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
+ X265_FREAD(analysis->lookahead.plannedSatd, sizeof(int64_t), vbvCount,
m_analysisFileIn, picData->lookahead.plannedSatd);
if (m_param->scaleFactor)
{
# HG changeset patch
# User Kavitha Sampath <[email protected]>
# Date 1527681605 -19800
# Wed May 30 17:30:05 2018 +0530
# Branch stable
# Node ID c9234756abe6f559201e2dec78688c50a939986d
# Parent e3ff1e578df3fd35d349363cde29856165921429
fix signed/unsigned mismatch warning in windows
diff -r e3ff1e578df3 -r c9234756abe6 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp Tue May 29 19:43:53 2018 +0530
+++ b/source/encoder/encoder.cpp Wed May 30 17:30:05 2018 +0530
@@ -3408,12 +3408,12 @@
allocAnalysis(analysis);
if (m_param->bDisableLookahead && m_rateControl->m_isVbv)
{
- uint64_t vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
+ size_t vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
X265_FREAD(analysis->lookahead.intraVbvCost, sizeof(uint32_t), analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.intraVbvCost);
X265_FREAD(analysis->lookahead.vbvCost, sizeof(uint32_t), analysis->numCUsInFrame, m_analysisFileIn, picData->lookahead.vbvCost);
X265_FREAD(analysis->lookahead.satdForVbv, sizeof(uint32_t), analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.satdForVbv);
X265_FREAD(analysis->lookahead.intraSatdForVbv, sizeof(uint32_t), analysis->numCuInHeight, m_analysisFileIn, picData->lookahead.intraSatdForVbv);
- X265_FREAD(analysis->lookahead.plannedSatd, sizeof(uint64_t), vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
+ X265_FREAD(analysis->lookahead.plannedSatd, sizeof(int64_t), vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
if (m_param->scaleFactor)
{
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
