shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1668 from mstorsjo/fix-warnings

Fix build warnings with GCC

--- a/codec/decoder/core/src/au_parser.cpp

+++ b/codec/decoder/core/src/au_parser.cpp

@@ -1437,7 +1437,7 @@

   defaultScaling[2] = bInit ? pSps->iScalingList8x8[0] : g_kuiDequantScaling8x8Default[0];

   defaultScaling[3] = bInit ? pSps->iScalingList8x8[1] : g_kuiDequantScaling8x8Default[1];

-  for (int i = 0; i < uiScalingListNum; i++) {

+  for (unsigned int i = 0; i < uiScalingListNum; i++) {

     WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode));

     pScalingListPresentFlag[i] = !!uiCode;

     if (!!uiCode) {

--- a/codec/decoder/core/src/decode_slice.cpp

+++ b/codec/decoder/core/src/decode_slice.cpp

@@ -921,10 +921,8 @@

 }

 // Calculate deqaunt coeff scaling list value

 int32_t  WelsCalcDeqCoeffScalingList (PWelsDecoderContext pCtx) {

-  int32_t iScalingListNum = 0;

   if (pCtx->pSps->bSeqScalingMatrixPresentFlag || pCtx->pPps->bPicScalingMatrixPresentFlag) {

     pCtx->bUseScalingList = true;

-    iScalingListNum = (pCtx->pSps->uiChromaFormatIdc != 3) ? 8 : 12;

     if (!pCtx->bDequantCoeff4x4Init || (pCtx->iDequantCoeffPpsid != pCtx->pPps->iPpsId)) {

       int i, q, x;

--- a/codec/decoder/core/src/parse_mb_syn_cabac.cpp

+++ b/codec/decoder/core/src/parse_mb_syn_cabac.cpp

@@ -825,7 +825,7 @@

   uint32_t uiCbpBit;

   int32_t pSignificantMap[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

-  int32_t iMbResProperty;

+  int32_t iMbResProperty = 0;

   GetMbResProperty (&iMbResProperty, &iResProperty, false);

   const uint16_t* pDeQuantMul = (pCtx->bUseScalingList) ? pCtx->pDequant_coeff4x4[iMbResProperty][uiQp] :

                                 g_kuiDequantCoeff[uiQp];