Don't stash the cabac state into the SBitStringAux buffer

This fixes crashes on some platforms, and fixes valgrind
errors.
This commit is contained in:
Martin Storsjö 2014-10-28 14:35:43 +02:00
parent 292d2511e2
commit 9a9f92bcfe

View File

@ -216,13 +216,13 @@ int32_t StashPopMBStatusCavlc (SDynamicSlicingStack* pDss, void* pBuffer, SSlice
return pDss->iMbSkipRunStack;
}
void StashMBStatusCabac (SDynamicSlicingStack* pDss, void* pBuffer, SSlice* pSlice, int32_t iMbSkipRun) {
SCabacCtx* pCtx = (SCabacCtx*)pBuffer;
SCabacCtx* pCtx = &pSlice->sCabacCtx;
memcpy (&pDss->sStoredCabac, pCtx, sizeof (SCabacCtx));
pDss->uiLastMbQp = pSlice->uiLastMbQp;
pDss->iMbSkipRunStack = iMbSkipRun;
}
int32_t StashPopMBStatusCabac (SDynamicSlicingStack* pDss, void* pBuffer, SSlice* pSlice) {
SCabacCtx* pCtx = (SCabacCtx*)pBuffer;
SCabacCtx* pCtx = &pSlice->sCabacCtx;
memcpy (pCtx, &pDss->sStoredCabac, sizeof (SCabacCtx));
pSlice->uiLastMbQp = pDss->uiLastMbQp;
return pDss->iMbSkipRunStack;