diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 15:58:52 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 15:58:52 +0200 |
| commit | cebe51a6255e04b8dcd15fcbab359ed00dbb3ab1 (patch) | |
| tree | 0cae1e8ca86b8b3aa399b0786006e78839e05279 | |
| parent | 8ca97b5e4f470cf24fac5e0599dd63c7af142c22 (diff) | |
| parent | 9d58639e270f7612874681e0ca30fa461e2667b7 (diff) | |
| download | ffmpeg-n2.9-dev.tar.gz | |
Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7'n2.9-dev
* commit '9d58639e270f7612874681e0ca30fa461e2667b7':
sws: Drop deprecated SWS_CPU_CAPS defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libswscale/swscale.h | 16 | ||||
| -rw-r--r-- | libswscale/version.h | 7 |
2 files changed, 0 insertions, 23 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 6d8d40ccc0..ff3f630ec1 100644 --- a/libswscale/swscale.h +++ b/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 diff --git a/libswscale/version.h b/libswscale/version.h index 228c5770eb..93a458ee5d 100644 --- a/libswscale/version.h +++ b/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 */ |