History

resolve conflict

volvet committed 12 years ago

Commit ec84f4b1 parent 3958118124 files · +15352 −15696Browse files

Showing the changes to codec/encoder/core/src/deblocking.cpp (1 of 124 files). Show all

Unified · Split

codec/encoder/core/src/deblocking.cpp+4−4
@@ -994,15 +994,15 @@ void DeblockingInit (DeblockingFunc* pFunc, int32_t iCpu) { · 993 unmodified lines
994 994
995 995
996#ifdef X86_ASM996#ifdef X86_ASM
997 if (iCpu & WELS_CPU_SSE2) {997 if (iCpu & WELS_CPU_SSE2) {
998 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_sse2;998 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_sse2;
999 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_sse2;999 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_sse2;
1000 pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_sse2;1000 pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_sse2;
1001 pFunc->pfLumaDeblockingEQ4Hor = DeblockLumaEq4H_sse2;1001 pFunc->pfLumaDeblockingEQ4Hor = DeblockLumaEq4H_sse2;
1002 pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_sse2;1002 pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_sse2;
1003 pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_sse2;1003 pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_sse2;
1004 pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_sse2;1004 pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_sse2;
1005 pFunc->pfChromaDeblockinEQ4Hor = DeblockChromaEq4H_sse2;1005 pFunc->pfChromaDeblockinEQ4Hor = DeblockChromaEq4H_sse2;
1006 }1006 }
1007#endif1007#endif
1008}1008}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t