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

4
codec/encoder/core/src/encoder_ext.cpp
View File

@@ -1919,7 +1919,7 @@ void OutputCpuFeaturesLog (uint32_t uiCpuFeatureFlags, uint32_t uiCpuCores, int3
uiCpuCores,
iCacheLineSize);
#ifdef _DEBUG // output at console & _debug
//#ifdef _DEBUG // output at console & _debug
fprintf (stderr, "WELS CPU features/capacities (0x%x) detected: \n" \
"HTT: %c, " \
"MMX: %c, " \
@@ -1962,7 +1962,7 @@ void OutputCpuFeaturesLog (uint32_t uiCpuFeatureFlags, uint32_t uiCpuCores, int3
(uiCpuFeatureFlags & WELS_CPU_AES) ? 'Y' : 'N',
uiCpuCores,
iCacheLineSize);
#endif//_DEBUG
//#endif//_DEBUG
}
/*!