ref: bbb6ffd9117ddbf02232ebdd4477dbc162c6c411
parent: 218ade304c7b8e69769ddeb126c49053e7e174d2
parent: 61067d488fd7b4a66845863fcbd9bed14030a4f0
author: volvet <[email protected]>
date: Tue Feb 18 11:54:55 EST 2014
Merge pull request #299 from mstorsjo/fix-renamed-struct Fix building with MT_DEBUG enabled after the encoder interface update
--- a/codec/encoder/core/src/slice_multi_threading.cpp
+++ b/codec/encoder/core/src/slice_multi_threading.cpp
@@ -1459,7 +1459,7 @@
while (iSpatialIdx < iSpatialNum) {
const int32_t kiDid = pDidList[iSpatialIdx];
SDLayerParam* pDlp = &pPara->sDependencyLayers[kiDid];
- SMulSliceOption* pMso = &pDlp->sSliceCfg;
+ SSliceConfig* pMso = &pDlp->sSliceCfg;
SDqLayer* pCurDq = pCtx->ppDqLayerList[kiDid];
SSliceCtx* pSliceCtx = pCurDq->pSliceEncCtx;
const uint32_t kuiCountSliceNum = pSliceCtx->iSliceNumInFrame;