aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/swscale.h
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2012-11-16 15:00:49 +0100
committerJanne Grunau <janne-libav@jannau.net>2012-11-16 15:04:57 +0100
commit80716953c22762a5ebeb8f933f5ad3dc493cf2db (patch)
tree16203ec343ac6a0f5c9281bea6b062864afa7d97 /libswscale/swscale.h
parent8f5587c3d0bc4b5f075e4282215bda91a21fc12e (diff)
downloadffmpeg-80716953c22762a5ebeb8f933f5ad3dc493cf2db.tar.gz
libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR
SWS_CPU_CAPS are deprecated and slated to removed with libswscale major version 3. No need to provide a SWS_CPU_CAPS_MMX2 as backward compatibility define under the same explicit condition.
Diffstat (limited to 'libswscale/swscale.h')
-rw-r--r--libswscale/swscale.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 598946d807..8ba09e6960 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -85,9 +85,7 @@ const char *swscale_license(void);
*/
#define SWS_CPU_CAPS_MMX 0x80000000
#define SWS_CPU_CAPS_MMXEXT 0x20000000
-#if LIBSWSCALE_VERSION_MAJOR < 3
#define SWS_CPU_CAPS_MMX2 0x20000000
-#endif
#define SWS_CPU_CAPS_3DNOW 0x40000000
#define SWS_CPU_CAPS_ALTIVEC 0x10000000
#define SWS_CPU_CAPS_BFIN 0x01000000