[FFmpeg-cvslog] swscale: revive SWS_CPU_CAPS until next major bump.
Anton Khirnov
git at videolan.org
Fri May 27 02:53:52 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed May 25 21:47:31 2011 +0200| [c7a973e44aba0a2e59fdd8957738c32b9fae872e] | committer: Anton Khirnov
swscale: revive SWS_CPU_CAPS until next major bump.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7a973e44aba0a2e59fdd8957738c32b9fae872e
---
libswscale/swscale.h | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 1babced..6ab59c6 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -50,6 +50,9 @@
#ifndef FF_API_SWS_GETCONTEXT
#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 2)
#endif
+#ifndef FF_API_SWS_CPU_CAPS
+#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 2)
+#endif
/**
* Returns the LIBSWSCALE_VERSION_INT constant.
@@ -95,6 +98,19 @@ const char *swscale_license(void);
#define SWS_ACCURATE_RND 0x40000
#define SWS_BITEXACT 0x80000
+#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_MMX2 0x20000000
+#define SWS_CPU_CAPS_3DNOW 0x40000000
+#define SWS_CPU_CAPS_ALTIVEC 0x10000000
+#define SWS_CPU_CAPS_BFIN 0x01000000
+#define SWS_CPU_CAPS_SSE2 0x02000000
+#endif
+
#define SWS_MAX_REDUCE_CUTOFF 0.002
#define SWS_CS_ITU709 1
More information about the ffmpeg-cvslog
mailing list