History

resolve conflict

volvet committed 12 years ago

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

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+2−2
@@ -1919,7 +1919,7 @@ void OutputCpuFeaturesLog (uint32_t uiCpuFeatureFlags, uint32_t uiCpuCores, int3 · 1918 unmodified lines
1919 uiCpuCores,1919 uiCpuCores,
1920 iCacheLineSize);1920 iCacheLineSize);
1921 1921
1922#ifdef _DEBUG // output at console & _debug1922//#ifdef _DEBUG // output at console & _debug
1923 fprintf (stderr, "WELS CPU features/capacities (0x%x) detected: \n" \1923 fprintf (stderr, "WELS CPU features/capacities (0x%x) detected: \n" \
1924 "HTT: %c, " \1924 "HTT: %c, " \
1925 "MMX: %c, " \1925 "MMX: %c, " \
@@ -1962,7 +1962,7 @@ void OutputCpuFeaturesLog (uint32_t uiCpuFeatureFlags, uint32_t uiCpuCores, int3 · 36 unmodified lines
1962 (uiCpuFeatureFlags & WELS_CPU_AES) ? 'Y' : 'N',1962 (uiCpuFeatureFlags & WELS_CPU_AES) ? 'Y' : 'N',
1963 uiCpuCores,1963 uiCpuCores,
1964 iCacheLineSize);1964 iCacheLineSize);
1965#endif//_DEBUG1965//#endif//_DEBUG
1966}1966}
1967 1967
1968/*!1968/*!

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