shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2535 from mstorsjo/silence-warnings

Silence warnings with GCC 5.4

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

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

@@ -48,7 +48,7 @@

   int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;

   int32_t iLeftTopType, iRightTopType, iTopType, iLeftType;

-  int32_t iCurX, iCurY, iCurXy, iLeftXy, iTopXy, iLeftTopXy, iRightTopXy = 0;

+  int32_t iCurX, iCurY, iCurXy, iLeftXy, iTopXy = 0, iLeftTopXy = 0, iRightTopXy = 0;

   int8_t iLeftRef;

   int8_t iTopRef;

--- a/codec/processing/src/backgrounddetection/BackgroundDetection.cpp

+++ b/codec/processing/src/backgrounddetection/BackgroundDetection.cpp

@@ -278,7 +278,7 @@

       // chroma component check

       if (pBackgroundOU->iBackgroundFlag == 1) {

-        int8_t iNeighbourForegroundFlags = !pOUNeighbours[0]->iBackgroundFlag | ((!pOUNeighbours[1]->iBackgroundFlag) << 1)

+        int8_t iNeighbourForegroundFlags = (!pOUNeighbours[0]->iBackgroundFlag) | ((!pOUNeighbours[1]->iBackgroundFlag) << 1)

                                             | ((!pOUNeighbours[2]->iBackgroundFlag) << 2) | ((!pOUNeighbours[3]->iBackgroundFlag) << 3);

         pBackgroundOU->iBackgroundFlag = !ForegroundDilation23Chroma (iNeighbourForegroundFlags, iChromaSampleStartPos,

                                          iPicStrideUV, pBgdParam);

--- a/test/decoder/DecUT_PredMv.cpp

+++ b/test/decoder/DecUT_PredMv.cpp

@@ -266,7 +266,7 @@

   int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;

   int32_t iLeftTopType, iRightTopType, iTopType, iLeftType;

-  int32_t iCurX, iCurY, iCurXy, iLeftXy, iTopXy, iLeftTopXy, iRightTopXy = 0;

+  int32_t iCurX, iCurY, iCurXy, iLeftXy, iTopXy = 0, iLeftTopXy = 0, iRightTopXy = 0;

   int8_t iLeftRef;

   int8_t iTopRef;