[x265] [PATCH] fix build warnings in Linux

[Ashok Kumar Mishra]

On Tue, May 29, 2018 at 7:25 PM, <bhavna at multicorewareinc.com> wrote:

> # HG changeset patch
> # User Bhavna Hariharan <bhavna at multicorewareinc.com>
> # Date 1527601396 -19800
> #      Tue May 29 19:13:16 2018 +0530
> # Node ID 2d1fd0bb3a627842c490cbd86159f09472f98153
> # Parent  9db5be89d74cc55cd6aff30c2a576119ca09d8a1
> fix build warnings in Linux
>
> diff -r 9db5be89d74c -r 2d1fd0bb3a62 source/encoder/encoder.cpp
> --- a/source/encoder/encoder.cpp        Tue May 29 12:50:04 2018 +0530
> +++ b/source/encoder/encoder.cpp        Tue May 29 19:13:16 2018 +0530
> @@ -3408,16 +3408,16 @@
>      allocAnalysis(analysis);
>      if (m_param->bDisableLookahead && m_rateControl->m_isVbv)
>      {
> -        int vbvCount = m_param->lookaheadDepth + m_param->bframes + 2;
> +        uint64_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(int64_t),
> vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
> +        X265_FREAD(analysis->lookahead.plannedSatd, sizeof(uint64_t),
> vbvCount, m_analysisFileIn, picData->lookahead.plannedSatd);
>
>          if (m_param->scaleFactor)
>          {
> -            for (int index = 0; index < vbvCount; index++)
> +            for (uint64_t index = 0; index < vbvCount; index++)
>                  analysis->lookahead.plannedSatd[index] *= factor;
>
>              for (uint32_t i = 0; i < analysis->numCuInHeight; i++)
>
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
>
Pushed.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20180529/5f73d1e4/attachment.html>