merge common part of wels_common_basis

huili2 committed 11 years ago

Commit 403cc571 parent b66703112 files · +97 −155Browse files

Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 12 files). Show all

Unified · Split

codec/decoder/core/src/decoder_core.cpp+1−1

@@ -1230,7 +1230,7 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 1229 unmodified lines
1230		1230
1231	memset (pDq, 0, sizeof (SDqLayer));	1231	memset (pDq, 0, sizeof (SDqLayer));
1232		1232
1233	pCtx->sMb.pMbType[i] = (int8_t)WelsMallocz (pCtx->sMb.iMbWidth pCtx->sMb.iMbHeight * sizeof (int8_t),	1233	pCtx->sMb.pMbType[i] = (int16_t)WelsMallocz (pCtx->sMb.iMbWidth pCtx->sMb.iMbHeight * sizeof (int16_t),
1234	"pCtx->sMb.pMbType[]");	1234	"pCtx->sMb.pMbType[]");
1235	pCtx->sMb.pMv[i][0] = (int16_t ()[16][2])WelsMallocz (pCtx->sMb.iMbWidth pCtx->sMb.iMbHeight * sizeof (	1235	pCtx->sMb.pMv[i][0] = (int16_t ()[16][2])WelsMallocz (pCtx->sMb.iMbWidth pCtx->sMb.iMbHeight * sizeof (
1236	int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMv[][]");	1236	int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMv[][]");