diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-04-04 17:20:53 +0400 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-04-04 17:20:53 +0400 |
| commit | 6b4343616cf425e803b3cba2d898b611de3bbf02 (patch) | |
| tree | 82974c5ebb63a1a0f5b6ead2e97ca34ef9f1fa46 /libavcodec/avcodec.h | |
| parent | 1b2120c39db33976eaa8ea1abb9fd67a19b00a36 (diff) | |
Rename FF_MM_MMXEXT to FF_MM_MMX2, for both clarity and consistency
with libswscale.
Originally committed as revision 18330 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8cedeb922f..313f848bb0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 @@ typedef struct AVCodecContext { /* 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 |