Merge pull request #299 from mstorsjo/fix-renamed-struct

Fix building with MT_DEBUG enabled after the encoder interface update

volvet committed 12 years ago

Commit bbb6ffd2 parents 218ade3 61067d41 file · +1 −1Browse files

Unified · Split

codec/encoder/core/src/slice_multi_threading.cpp+1−1

@@ -1459,7 +1459,7 @@ void TrackSliceConsumeTime (sWelsEncCtx* pCtx, int32_t* pDidList, const int32_t · 1458 unmodified lines
1459	while (iSpatialIdx < iSpatialNum) {	1459	while (iSpatialIdx < iSpatialNum) {
1460	const int32_t kiDid = pDidList[iSpatialIdx];	1460	const int32_t kiDid = pDidList[iSpatialIdx];
1461	SDLayerParam* pDlp = &pPara->sDependencyLayers[kiDid];	1461	SDLayerParam* pDlp = &pPara->sDependencyLayers[kiDid];
1462	SMulSliceOption* pMso = &pDlp->sSliceCfg;	1462	SSliceConfig* pMso = &pDlp->sSliceCfg;
1463	SDqLayer* pCurDq = pCtx->ppDqLayerList[kiDid];	1463	SDqLayer* pCurDq = pCtx->ppDqLayerList[kiDid];
1464	SSliceCtx* pSliceCtx = pCurDq->pSliceEncCtx;	1464	SSliceCtx* pSliceCtx = pCurDq->pSliceEncCtx;
1465	const uint32_t kuiCountSliceNum = pSliceCtx->iSliceNumInFrame;	1465	const uint32_t kuiCountSliceNum = pSliceCtx->iSliceNumInFrame;