Commit 2b04858a authored by Anton Khirnov's avatar Anton Khirnov Committed by Michael Niedermayer

swscale: revive SWS_CPU_CAPS until next major bump.

parent 11f2eae2
...@@ -50,6 +50,9 @@ ...@@ -50,6 +50,9 @@
#ifndef FF_API_SWS_GETCONTEXT #ifndef FF_API_SWS_GETCONTEXT
#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 2) #define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 2)
#endif #endif
#ifndef FF_API_SWS_CPU_CAPS
#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 2)
#endif
/** /**
* Returns the LIBSWSCALE_VERSION_INT constant. * Returns the LIBSWSCALE_VERSION_INT constant.
...@@ -95,13 +98,18 @@ const char *swscale_license(void); ...@@ -95,13 +98,18 @@ const char *swscale_license(void);
#define SWS_ACCURATE_RND 0x40000 #define SWS_ACCURATE_RND 0x40000
#define SWS_BITEXACT 0x80000 #define SWS_BITEXACT 0x80000
//The following flags are only provided for API/ABI compatibility they have no effect anymore #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_MMX 0x80000000
#define SWS_CPU_CAPS_MMX2 0x20000000 #define SWS_CPU_CAPS_MMX2 0x20000000
#define SWS_CPU_CAPS_3DNOW 0x40000000 #define SWS_CPU_CAPS_3DNOW 0x40000000
#define SWS_CPU_CAPS_ALTIVEC 0x10000000 #define SWS_CPU_CAPS_ALTIVEC 0x10000000
#define SWS_CPU_CAPS_BFIN 0x01000000 #define SWS_CPU_CAPS_BFIN 0x01000000
#define SWS_CPU_CAPS_SSE2 0x02000000 #define SWS_CPU_CAPS_SSE2 0x02000000
#endif
#define SWS_MAX_REDUCE_CUTOFF 0.002 #define SWS_MAX_REDUCE_CUTOFF 0.002
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment