generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
volvet
2014-01-03 14:49:45 +08:00
parent 3958118bf0
commit ec84f4bcc9
124 changed files with 15530 additions and 15874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codec/encoder/core/src/deblocking.cpp
View File

@@ -994,15 +994,15 @@ void DeblockingInit (DeblockingFunc* pFunc, int32_t iCpu) {
#ifdef X86_ASM
if (iCpu & WELS_CPU_SSE2) {
if (iCpu & WELS_CPU_SSE2) {
pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_sse2;
pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_sse2;
pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_sse2;
pFunc->pfLumaDeblockingEQ4Hor = DeblockLumaEq4H_sse2;
pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_sse2;
pFunc->pfLumaDeblockingEQ4Hor = DeblockLumaEq4H_sse2;
pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_sse2;
pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_sse2;
pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_sse2;
pFunc->pfChromaDeblockinEQ4Hor = DeblockChromaEq4H_sse2;
pFunc->pfChromaDeblockinEQ4Hor = DeblockChromaEq4H_sse2;
}
#endif
}