Merge pull request #2212 from ruil2/rc2

remove an useless code line

HaiboZhu committed 11 years ago

Commit 643df652 parents f1b10e4 a2515041 file · +0 −4Browse files

Showing the changes to codec/encoder/core/src/ratectl.cpp (1 of 1 file). Show all

Unified · Split

codec/encoder/core/src/ratectl.cpp+0−4

@@ -672,10 +672,6 @@ void RcCalculateGomQp (sWelsEncCtx* pEncCtx, SMB* pCurMb, int32_t iSliceId) { · 671 unmodified lines
672	}	672	}
673	pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);	673	pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
674		674
675	if (! (((pEncCtx->pSvcParam->iRCMode == RC_BITRATE_MODE) \|\| (pEncCtx->pSvcParam->iRCMode == RC_TIMESTAMP_MODE))
676	&& (pEncCtx->pSvcParam->bEnableFrameSkip == false)))
677	pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
678
679	pSOverRc->iGomBitsSlice = 0;	675	pSOverRc->iGomBitsSlice = 0;
680		676
681	}	677	}