diff options
Diffstat (limited to 'apps/codecs/libwmapro/libavutil/internal.h')
-rw-r--r-- | apps/codecs/libwmapro/libavutil/internal.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/apps/codecs/libwmapro/libavutil/internal.h b/apps/codecs/libwmapro/libavutil/internal.h index 97087e462a..87a4d3ec10 100644 --- a/apps/codecs/libwmapro/libavutil/internal.h +++ b/apps/codecs/libwmapro/libavutil/internal.h | |||
@@ -55,7 +55,8 @@ | |||
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | #ifndef av_alias | 57 | #ifndef av_alias |
58 | #if HAVE_ATTRIBUTE_MAY_ALIAS && (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3) | 58 | //#if HAVE_ATTRIBUTE_MAY_ALIAS && (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3) |
59 | #if 0 | ||
59 | # define av_alias __attribute__((may_alias)) | 60 | # define av_alias __attribute__((may_alias)) |
60 | #else | 61 | #else |
61 | # define av_alias | 62 | # define av_alias |
@@ -106,7 +107,8 @@ | |||
106 | #define LABEL_MANGLE(a) EXTERN_PREFIX #a | 107 | #define LABEL_MANGLE(a) EXTERN_PREFIX #a |
107 | 108 | ||
108 | // Use rip-relative addressing if compiling PIC code on x86-64. | 109 | // Use rip-relative addressing if compiling PIC code on x86-64. |
109 | #if ARCH_X86_64 && defined(PIC) | 110 | //#if ARCH_X86_64 && defined(PIC) |
111 | #if 0 | ||
110 | # define LOCAL_MANGLE(a) #a "(%%rip)" | 112 | # define LOCAL_MANGLE(a) #a "(%%rip)" |
111 | #else | 113 | #else |
112 | # define LOCAL_MANGLE(a) #a | 114 | # define LOCAL_MANGLE(a) #a |
@@ -127,7 +129,8 @@ | |||
127 | 129 | ||
128 | /* math */ | 130 | /* math */ |
129 | 131 | ||
130 | #if ARCH_X86 | 132 | //#if ARCH_X86 |
133 | #if 0 | ||
131 | #define MASK_ABS(mask, level)\ | 134 | #define MASK_ABS(mask, level)\ |
132 | __asm__ volatile(\ | 135 | __asm__ volatile(\ |
133 | "cltd \n\t"\ | 136 | "cltd \n\t"\ |
@@ -198,10 +201,10 @@ | |||
198 | * without modification. Used to disable the definition of strings | 201 | * without modification. Used to disable the definition of strings |
199 | * (for example AVCodec long_names). | 202 | * (for example AVCodec long_names). |
200 | */ | 203 | */ |
201 | #if CONFIG_SMALL | 204 | //#if CONFIG_SMALL |
202 | # define NULL_IF_CONFIG_SMALL(x) NULL | 205 | //# define NULL_IF_CONFIG_SMALL(x) NULL |
203 | #else | 206 | //#else |
204 | # define NULL_IF_CONFIG_SMALL(x) x | 207 | //# define NULL_IF_CONFIG_SMALL(x) x |
205 | #endif | 208 | //#endif |
206 | 209 | ||
207 | #endif /* AVUTIL_INTERNAL_H */ | 210 | #endif /* AVUTIL_INTERNAL_H */ |