Merge pull request #1526 from ruil2/max_nal_size

add return value processing

sijchen committed 12 years ago

Commit 0252f3f2 parents b05a52b 66165a62 files · +12 −4Browse files

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+7−2

@@ -2086,9 +2086,14 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 2085 unmodified lines
2086	return iRet;	2086	return iRet;
2087	}	2087	}
2088		2088
2089	if (pCodingParam->iMultipleThreadIdc > 1)	2089	if (pCodingParam->iMultipleThreadIdc > 1) {
2090	iRet = CreateSliceThreads (pCtx);	2090	iRet = CreateSliceThreads (pCtx);
2091		2091	if (iRet != 0) {
		2092	WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitEncoderExt(), CreateSliceThreads failed return %d.", iRet);
		2093	FreeMemorySvc (&pCtx);
		2094	return iRet;
		2095	}
		2096	}
2092	if (pCodingParam->iEntropyCodingModeFlag)	2097	if (pCodingParam->iEntropyCodingModeFlag)
2093	WelsCabacInit (pCtx);	2098	WelsCabacInit (pCtx);
2094	WelsRcInitModule (pCtx, pCtx->pSvcParam->iRCMode);	2099	WelsRcInitModule (pCtx, pCtx->pSvcParam->iRCMode);