|
8 | 8 | #define __MFXDEFS_H__ |
9 | 9 |
|
10 | 10 | #define MFX_VERSION_MAJOR 2 |
11 | | -#define MFX_VERSION_MINOR 2 |
| 11 | +#define MFX_VERSION_MINOR 3 |
12 | 12 |
|
13 | 13 | // MFX_VERSION - version of API that 'assumed' by build may be provided externally |
14 | 14 | // if it omitted then latest stable API derived from Major.Minor is assumed |
|
27 | 27 | /*! The corresponding version of the Intel(r) Media SDK legacy API that is used as a basis |
28 | 28 | for the current API. */ |
29 | 29 |
|
30 | | -#define MFX_LEGACY_VERSION 1034 |
| 30 | +#define MFX_LEGACY_VERSION 1035 |
31 | 31 |
|
32 | 32 |
|
33 | 33 | #ifdef __cplusplus |
@@ -85,6 +85,48 @@ extern "C" |
85 | 85 |
|
86 | 86 | #define MFX_INFINITE 0xFFFFFFFF |
87 | 87 |
|
| 88 | +#ifndef MFX_DEPRECATED_OFF |
| 89 | + #if defined(__cplusplus) && __cplusplus >= 201402L |
| 90 | + #define MFX_DEPRECATED [[deprecated]] |
| 91 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg [[deprecated]] |
| 92 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) |
| 93 | + #elif defined(__clang__) |
| 94 | + #define MFX_DEPRECATED __attribute__((deprecated)) |
| 95 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated)) |
| 96 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) |
| 97 | + #elif defined(__INTEL_COMPILER) |
| 98 | + #if (defined(_WIN32) || defined(_WIN64)) |
| 99 | + #define MFX_DEPRECATED __declspec(deprecated) |
| 100 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg |
| 101 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg)) |
| 102 | + #elif defined(__linux__) |
| 103 | + #define MFX_DEPRECATED __attribute__((deprecated)) |
| 104 | + #if defined(__cplusplus) |
| 105 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated)) |
| 106 | + #else |
| 107 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg |
| 108 | + #endif |
| 109 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) |
| 110 | + #endif |
| 111 | + #elif defined(_MSC_VER) && _MSC_VER > 1200 // VS 6 doesn't support deprecation |
| 112 | + #define MFX_DEPRECATED __declspec(deprecated) |
| 113 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg |
| 114 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg)) |
| 115 | + #elif defined(__GNUC__) |
| 116 | + #define MFX_DEPRECATED __attribute__((deprecated)) |
| 117 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated)) |
| 118 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) |
| 119 | + #else |
| 120 | + #define MFX_DEPRECATED |
| 121 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg |
| 122 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) |
| 123 | + #endif |
| 124 | + #else |
| 125 | + #define MFX_DEPRECATED |
| 126 | + #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg |
| 127 | + #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) |
| 128 | + #endif |
| 129 | + |
88 | 130 | typedef unsigned char mfxU8; /*!< Unsigned integer, 8 bit type. */ |
89 | 131 | typedef char mfxI8; /*!< Signed integer, 8 bit type. */ |
90 | 132 | typedef short mfxI16; /*!< Signed integer, 16 bit type. */ |
|
0 commit comments