Merge pull request #1787 from mstorsjo/remove-stray-semicolon

Remove accidental double semicolons

sijchen committed 11 years ago

Commit 5fdd01e2 parents e7a7a35 a3063538 files · +10 −10Browse files

Showing the changes to codec/decoder (2 of 8 files). Show all

Unified · Split

2 files

codec/decoder/core/src/deblocking.cpp +1 −1
codec/decoder/core/src/error_concealment.cpp +1 −1

codec/decoder/core/src/deblocking.cpp+1−1

@@ -633,7 +633,7 @@ void FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, in · 632 unmodified lines
633	}	633	}
634		634
635	pFilter->iChromaQP[0] = pCurQp[0];	635	pFilter->iChromaQP[0] = pCurQp[0];
636	pFilter->iChromaQP[1] = pCurQp[1];;	636	pFilter->iChromaQP[1] = pCurQp[1];
637	if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {	637	if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {
638	GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,	638	GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
639	iBeta);	639	iBeta);

codec/decoder/core/src/error_concealment.cpp+1−1

@@ -125,7 +125,7 @@ void DoErrorConSliceCopy (PWelsDecoderContext pCtx) { · 124 unmodified lines
125	if (pSrcPic != NULL) {	125	if (pSrcPic != NULL) {
126	iSrcStride = pSrcPic->iLinesize[0];	126	iSrcStride = pSrcPic->iLinesize[0];
127	//Y component	127	//Y component
128	pDstData = pDstPic->pData[0] + iMbY * 16 * iDstStride + iMbX * 16;;	128	pDstData = pDstPic->pData[0] + iMbY * 16 * iDstStride + iMbX * 16;
129	pSrcData = pSrcPic->pData[0] + iMbY * 16 * iSrcStride + iMbX * 16;	129	pSrcData = pSrcPic->pData[0] + iMbY * 16 * iSrcStride + iMbX * 16;
130	pCtx->sCopyFunc.pCopyLumaFunc (pDstData, iDstStride, pSrcData, iSrcStride);	130	pCtx->sCopyFunc.pCopyLumaFunc (pDstData, iDstStride, pSrcData, iSrcStride);
131	//U component	131	//U component