shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #262 from orbitcowboy/master

cleanup unused variable in codec/common/deblocking_common.cpp.

--- a/codec/common/deblocking_common.cpp

+++ b/codec/common/deblocking_common.cpp

@@ -133,7 +133,6 @@

 }

 void_t DeblockChromaEq4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,

                            int32_t iBeta) {

-  int32_t d = 0;

   int32_t p0, p1, q0, q1;

   bool_t bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;

   for (int32_t i = 0; i < 8; i++) {

--- a/codec/processing/src/downsample/downsample.cpp

+++ b/codec/processing/src/downsample/downsample.cpp

@@ -94,9 +94,7 @@

   if ((iSrcWidthY >> 1) == iDstWidthY && (iSrcHeightY >> 1) == iDstHeightY) {

     // use half average functions

-    uint8_t iAlignIndex = 3;

-

-    iAlignIndex = GetAlignedIndex (iSrcWidthY);

+    uint8_t iAlignIndex = GetAlignedIndex (iSrcWidthY);

     m_pfDownsample.pfHalfAverage[iAlignIndex] ((uint8_t*)pDstPixMap->pPixel[0], pDstPixMap->iStride[0],

         (uint8_t*)pSrcPixMap->pPixel[0], pSrcPixMap->iStride[0], iSrcWidthY, iSrcHeightY);

@@ -119,7 +117,7 @@

 }

 int32_t CDownsampling::GetAlignedIndex (const int32_t kiSrcWidth) {

-  int32_t iAlignIndex = 3;

+  int32_t iAlignIndex;

   if ((kiSrcWidth & 0x1f) == 0)	// x32

     iAlignIndex	= 0;

   else if ((kiSrcWidth & 0x0f) == 0)	// x16