diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:18:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:34:32 +0200 |
| commit | c617bed34f39a122ab1f89581ddce9cc63885383 (patch) | |
| tree | ed2c0bd467f5f5c912ac46a2b95457a5647ced75 /libswscale/x86 | |
| parent | 98298eb1034bddb4557fa689553dae793c2b0092 (diff) | |
| parent | ede3d6400d7c06863e6eb4bcff5f676480ae6b5e (diff) | |
| download | ffmpeg-c617bed34f39a122ab1f89581ddce9cc63885383.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
MSS1 and MSS2: set final pixel format after common stuff has been initialised
MSS2 decoder
configure: handle --disable-asm before check_deps
x86: Split inline and external assembly #ifdefs
configure: x86: Separate inline from standalone assembler capabilities
pktdumper: Use a custom define instead of PATH_MAX for buffers
pktdumper: Use av_strlcpy instead of strncpy
pktdumper: Use sizeof(variable) instead of the direct buffer length
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/dct-test.c
libavcodec/imgconvert.c
libavcodec/mss12.c
libavcodec/version.h
libavfilter/x86/gradfun.c
libswscale/x86/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/swscale.c | 6 | ||||
| -rw-r--r-- | libswscale/x86/yuv2rgb.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 3d17c328c7..3217adf9e2 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -72,7 +72,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL; //MMX versions -#if HAVE_MMX +#if HAVE_MMX_INLINE #undef RENAME #define COMPILE_TEMPLATE_MMXEXT 0 #define RENAME(a) a ## _MMX @@ -80,7 +80,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL; #endif //MMX2 versions -#if HAVE_MMXEXT +#if HAVE_MMXEXT_INLINE #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT #define COMPILE_TEMPLATE_MMXEXT 1 @@ -375,7 +375,7 @@ av_cold void ff_sws_init_swScale_mmx(SwsContext *c) #if HAVE_INLINE_ASM if (cpu_flags & AV_CPU_FLAG_MMX) sws_init_swScale_MMX(c); -#if HAVE_MMXEXT +#if HAVE_MMXEXT_INLINE if (cpu_flags & AV_CPU_FLAG_MMXEXT) sws_init_swScale_MMX2(c); if (cpu_flags & AV_CPU_FLAG_SSE3){ diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 9445d08e84..9a9220ddba 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -50,22 +50,22 @@ DECLARE_ASM_CONST(8, uint64_t, pb_03) = 0x0303030303030303ULL; DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL; //MMX versions -#if HAVE_MMX +#if HAVE_MMX_INLINE #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT #define COMPILE_TEMPLATE_MMXEXT 0 #define RENAME(a) a ## _MMX #include "yuv2rgb_template.c" -#endif /* HAVE_MMX */ +#endif /* HAVE_MMX_INLINE */ //MMX2 versions -#if HAVE_MMXEXT +#if HAVE_MMXEXT_INLINE #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT #define COMPILE_TEMPLATE_MMXEXT 1 #define RENAME(a) a ## _MMX2 #include "yuv2rgb_template.c" -#endif /* HAVE_MMXEXT */ +#endif /* HAVE_MMXEXT_INLINE */ #endif /* HAVE_INLINE_ASM */ @@ -74,7 +74,7 @@ av_cold SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c) #if HAVE_INLINE_ASM int cpu_flags = av_get_cpu_flags(); -#if HAVE_MMXEXT +#if HAVE_MMXEXT_INLINE if (cpu_flags & AV_CPU_FLAG_MMXEXT) { switch (c->dstFormat) { case PIX_FMT_RGB24: return yuv420_rgb24_MMX2; |