Mercurial > libavcodec.hg

diff avcodec.h @ 9342:7f594601d5e9 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename FF_MM_MMXEXT to FF_MM_MMX2, for both clarity and consistency with libswscale.
author stefano
date Sat, 04 Apr 2009 13:20:53 +0000
parents 62940d73e9fe
children 4b801f9ae493
line wrap: on
line diff
--- a/avcodec.h	Fri Apr 03 14:03:49 2009 +0000
+++ b/avcodec.h	Sat Apr 04 13:20:53 2009 +0000
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 23
+#define LIBAVCODEC_VERSION_MINOR 24
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -1456,7 +1456,10 @@
     /* lower 16 bits - CPU features */
 #define FF_MM_MMX      0x0001 ///< standard MMX
 #define FF_MM_3DNOW    0x0004 ///< AMD 3DNOW
+#if LIBAVCODEC_VERSION_MAJOR < 53
 #define FF_MM_MMXEXT   0x0002 ///< SSE integer functions or AMD MMX ext
+#endif
+#define FF_MM_MMX2     0x0002 ///< SSE integer functions or AMD MMX ext
 #define FF_MM_SSE      0x0008 ///< SSE functions
 #define FF_MM_SSE2     0x0010 ///< PIV SSE2 functions
 #define FF_MM_3DNOWEXT 0x0020 ///< AMD 3DNowExt