shithub: openh264

Download patch

ref: 7048fe5377c17095f61316fda65dd619863b8ef9
parent: 3e258ea74ea0ca38c5b7e7690997e3e1201ff9fe
author: Martin Storsjö <[email protected]>
date: Sat May 17 18:04:03 EDT 2014

Remove two unused ifdefs

Nothing in the project sets HAVE_MMX.

The commented out code for setting pSearchMethodFunc can be readded
once it's actually implemented properly.

--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -2443,14 +2443,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) {