History

Provide a no-op WelsEmms macro if X86_ASM is disabled

This allows always calling this function, reducing the number of ifdefs in the calling code.

Martin Storsjö committed 12 years ago

Commit dd47d481 parent d767e213 files · +2 −12Browse files

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+0−4
@@ -2948,9 +2948,7 @@ int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst) { · 2947 unmodified lines
2948 pCtx->eLastNalPriority = NRI_PRI_HIGHEST;2948 pCtx->eLastNalPriority = NRI_PRI_HIGHEST;
2949 pFbi->iLayerNum = 1;2949 pFbi->iLayerNum = 1;
2950 2950
2951#if defined(X86_ASM)
2952 WelsEmms();2951 WelsEmms();
2953#endif //X86_ASM
2954 2952
2955 return ENC_RETURN_SUCCESS;2953 return ENC_RETURN_SUCCESS;
2956}2954}
@@ -3609,9 +3607,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo * pFbi, const SSou · 652 unmodified lines
3609 pCtx->eLastNalPriority = eNalRefIdc;3607 pCtx->eLastNalPriority = eNalRefIdc;
3610 pFbi->iLayerNum = iLayerNum;3608 pFbi->iLayerNum = iLayerNum;
3611 3609
3612#if defined(X86_ASM)
3613 WelsEmms();3610 WelsEmms();
3614#endif //X86_ASM
3615 3611
3616 pFbi->eOutputFrameType = eFrameType;3612 pFbi->eOutputFrameType = eFrameType;
3617 return ENC_RETURN_SUCCESS;3613 return ENC_RETURN_SUCCESS;

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