ref: 2e5700d32d78130c05b610840223d7cd4bb1e33a
parent: 3c2d9f7532878920d841acd8404dfd6c1fdf0d35
parent: 7048fe5377c17095f61316fda65dd619863b8ef9
author: sijchen <[email protected]>
date: Tue May 20 09:08:27 EDT 2014
Merge pull request #857 from mstorsjo/remove-unused-ifdef Remove two unused ifdefs
--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -2451,14 +2451,8 @@
pSearchMethodFunc = WelsDiamondCrossFeatureSearch;
break;
case ME_FULL:
-#ifdef HAVE_MMX
- // make sure your cpu can support x86 sse4.1 instruction set if try it
- //pSearchMethodFunc = WelsFullSearch;
-#else
pSearchMethodFunc = WelsDiamondSearch;
return false;
-#endif//HAVE_MMX
- break;
default:
pSearchMethodFunc = WelsDiamondSearch;
return false;
--- a/codec/processing/src/scrolldetection/ScrollDetection.h
+++ b/codec/processing/src/scrolldetection/ScrollDetection.h
@@ -46,11 +46,6 @@
WELSVP_NAMESPACE_BEGIN
-#ifdef HAVE_MMX
-WELSVP_EXTERN_C_BEGIN
-WELSVP_EXTERN_C_END
-#endif
-
class CScrollDetection : public IStrategy {public:
CScrollDetection (int32_t iCpuFlag) {