Merge pull request #210 from mstorsjo/cleanup-macros

Cleanup the common/macros.h header

volvet committed 12 years ago

Commit 8420fd32 parents a1c4914 89f2c8b4 files · +23 −144Browse files

Showing the changes to codec/decoder (1 of 4 files). Show all

Unified · Split

codec/decoder/core/src/deblocking.cpp+2−2

@@ -473,7 +473,7 @@ void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint · 472 unmodified lines
473	}	473	}
474	}	474	}
475		475
476	void_t /__FASTCALL/ FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {	476	void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
477	int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;	477	int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
478	int32_t iMbX = pCurDqLayer->iMbX;	478	int32_t iMbX = pCurDqLayer->iMbX;
479	int32_t iMbY = pCurDqLayer->iMbY;	479	int32_t iMbY = pCurDqLayer->iMbY;
@@ -521,7 +521,7 @@ void_t /__FASTCALL/ FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilt · 41 unmodified lines
521	pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);	521	pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
522	}	522	}
523	}	523	}
524	void_t /__FASTCALL/ FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {	524	void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
525	int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;	525	int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
526	int32_t iMbX = pCurDqLayer->iMbX;	526	int32_t iMbX = pCurDqLayer->iMbX;
527	int32_t iMbY = pCurDqLayer->iMbY;	527	int32_t iMbY = pCurDqLayer->iMbY;