Merge pull request #633 from volvet/rm_redundant_protect

remove redundant protect code

ruil2 committed 12 years ago

Commit 99931982 parents 646d943 e2e106a2 files · +12 −13Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 2 files). Show all

Unified · Split

@@ -1896,7 +1896,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 1895 unmodified lines
1896	#endif//ENABLE_TRACE_FILE	1896	#endif//ENABLE_TRACE_FILE
1897		1897
1898	pCodingParam->DetermineTemporalSettings();	1898	pCodingParam->DetermineTemporalSettings();
1899	iRet = AllocCodingParam (&pCtx->pSvcParam, pCtx->pMemAlign, pCodingParam->iSpatialLayerNum);	1899	iRet = AllocCodingParam (&pCtx->pSvcParam, pCtx->pMemAlign);
1900	if (iRet != 0) {	1900	if (iRet != 0) {
1901	FreeMemorySvc (&pCtx);	1901	FreeMemorySvc (&pCtx);
1902	return iRet;	1902	return iRet;

Keyboard shortcuts