Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7'

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

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

libswscale/swscale.h

@@ -82,22 +82,6 @@ const char *swscale_license(void);
 #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

libswscale/version.h

@@ -46,11 +46,4 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_SWS_CPU_CAPS
-#define FF_API_SWS_CPU_CAPS    (LIBSWSCALE_VERSION_MAJOR < 4)
-#endif
-#ifndef FF_API_ARCH_BFIN
-#define FF_API_ARCH_BFIN       (LIBSWSCALE_VERSION_MAJOR < 4)
-#endif
-
 #endif /* SWSCALE_VERSION_H */