Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7'

* commit '9d58639e270f7612874681e0ca30fa461e2667b7':
  sws: Drop deprecated SWS_CPU_CAPS defines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libswscale/swscale.h
index 6d8d40ccc0fcd92d4c6d0d6a3c443ed1cd8a2999,dfdab416fc547b620b9c8308f18314c4bc109c7b..ff3f630ec1443720f40a470f1a50b227810a613e
--- 1/libswscale/swscale.h
--- 2/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@@ -80,24 -81,7 +80,8 @@@ const char *swscale_license(void)
  #define SWS_DIRECT_BGR        0x8000
  #define SWS_ACCURATE_RND      0x40000
  #define SWS_BITEXACT          0x80000
 +#define SWS_ERROR_DIFFUSION  0x800000
  
- #if FF_API_SWS_CPU_CAPS
- /**
-  * CPU caps are autodetected now, those flags
-  * are only provided for API compatibility.
-  */
- #define SWS_CPU_CAPS_MMX      0x80000000
- #define SWS_CPU_CAPS_MMXEXT   0x20000000
- #define SWS_CPU_CAPS_MMX2     0x20000000
- #define SWS_CPU_CAPS_3DNOW    0x40000000
- #define SWS_CPU_CAPS_ALTIVEC  0x10000000
- #if FF_API_ARCH_BFIN
- #define SWS_CPU_CAPS_BFIN     0x01000000
- #endif
- #define SWS_CPU_CAPS_SSE2     0x02000000
- #endif
- 
  #define SWS_MAX_REDUCE_CUTOFF 0.002
  
  #define SWS_CS_ITU709         1

diff --cc libswscale/version.h
Simple merge