shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2040 from mstorsjo/fix-warnings

Avoid warnings about comparison between signed and unsigned

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -1781,10 +1781,10 @@

       bDynamicSlice = true;

       uiMaxSliceNumEstimation = WELS_MIN (AVERSLICENUM_CONSTRAINT,

                                           (iLayerBsSize / pMso->sSliceArgument.uiSliceSizeConstraint) + 1);

-      (*ppCtx)->iMaxSliceCount = WELS_MAX ((*ppCtx)->iMaxSliceCount, uiMaxSliceNumEstimation);

+      (*ppCtx)->iMaxSliceCount = WELS_MAX ((*ppCtx)->iMaxSliceCount, (int) uiMaxSliceNumEstimation);

       iSliceBufferSize = (WELS_MAX(pMso->sSliceArgument.uiSliceSizeConstraint, iLayerBsSize/uiMaxSliceNumEstimation)<<1) + MAX_MACROBLOCK_SIZE_IN_BYTE_x2;

     } else {

-      (*ppCtx)->iMaxSliceCount = WELS_MAX ((*ppCtx)->iMaxSliceCount, pMso->sSliceArgument.uiSliceNum);

+      (*ppCtx)->iMaxSliceCount = WELS_MAX ((*ppCtx)->iMaxSliceCount, (int) pMso->sSliceArgument.uiSliceNum);

       iSliceBufferSize = ((iLayerBsSize / pMso->sSliceArgument.uiSliceNum)<<1) + MAX_MACROBLOCK_SIZE_IN_BYTE_x2;

     }

     iMaxSliceBufferSize = WELS_MAX(iMaxSliceBufferSize, iSliceBufferSize);