diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:38:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:42:34 +0200 |
| commit | db6b389c7f2176487cc4622a18f58e6b10af8e99 (patch) | |
| tree | caf15aa1b76925c7e152329af6d22c71523c12f4 /libswscale/x86 | |
| parent | 477641e9f8a711b65a463ea75a4167b7cfdc84a5 (diff) | |
| parent | a519583991c38d38503ab08357716513facc5725 (diff) | |
| download | ffmpeg-db6b389c7f2176487cc4622a18f58e6b10af8e99.tar.gz | |
Merge commit 'a519583991c38d38503ab08357716513facc5725'
* commit 'a519583991c38d38503ab08357716513facc5725':
swscale: x86: Hide arch-specific initialization details
Conflicts:
libswscale/x86/Makefile
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/Makefile | 6 | ||||
| -rw-r--r-- | libswscale/x86/swscale.c | 10 | ||||
| -rw-r--r-- | libswscale/x86/swscale_template.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/yuv2rgb.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libswscale/x86/Makefile b/libswscale/x86/Makefile index 7d219b458b..e767a5c420 100644 --- a/libswscale/x86/Makefile +++ b/libswscale/x86/Makefile @@ -1,11 +1,11 @@ $(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS) -OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o - -MMX-OBJS += x86/rgb2rgb.o \ +OBJS += x86/rgb2rgb.o \ x86/swscale.o \ x86/yuv2rgb.o \ +OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o + YASM-OBJS += x86/input.o \ x86/output.o \ x86/scale.o \ diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 961b6220d3..a86f9f82f3 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -377,22 +377,22 @@ INPUT_FUNCS(sse2); INPUT_FUNCS(ssse3); INPUT_FUNCS(avx); -av_cold void ff_sws_init_swScale_mmx(SwsContext *c) +av_cold void ff_sws_init_swscale_x86(SwsContext *c) { int cpu_flags = av_get_cpu_flags(); -#if HAVE_INLINE_ASM +#if HAVE_MMX_INLINE if (cpu_flags & AV_CPU_FLAG_MMX) - sws_init_swScale_MMX(c); + sws_init_swscale_MMX(c); +#endif #if HAVE_MMXEXT_INLINE if (cpu_flags & AV_CPU_FLAG_MMXEXT) - sws_init_swScale_MMXEXT(c); + sws_init_swscale_MMXEXT(c); if (cpu_flags & AV_CPU_FLAG_SSE3){ if(c->use_mmx_vfilter && !(c->flags & SWS_ACCURATE_RND)) c->yuv2planeX = yuv2yuvX_sse3; } #endif -#endif /* HAVE_INLINE_ASM */ #define ASSIGN_SCALE_FUNC2(hscalefn, filtersize, opt1, opt2) do { \ if (c->srcBpc == 8) { \ diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c index f2567c1d8b..c7a1bb46d9 100644 --- a/libswscale/x86/swscale_template.c +++ b/libswscale/x86/swscale_template.c @@ -1640,7 +1640,7 @@ static void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst1, int16_t *dst2, } #endif /* COMPILE_TEMPLATE_MMXEXT */ -static av_cold void RENAME(sws_init_swScale)(SwsContext *c) +static av_cold void RENAME(sws_init_swscale)(SwsContext *c) { enum AVPixelFormat dstFormat = c->dstFormat; diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index cceca49ca8..a54b84aae7 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -68,9 +68,9 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL; #endif /* HAVE_INLINE_ASM */ -av_cold SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c) +av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) { -#if HAVE_INLINE_ASM +#if HAVE_MMX_INLINE int cpu_flags = av_get_cpu_flags(); #if HAVE_MMXEXT_INLINE @@ -106,7 +106,7 @@ av_cold SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c) case AV_PIX_FMT_RGB555: return yuv420_rgb15_MMX; } } -#endif /* HAVE_INLINE_ASM */ +#endif /* HAVE_MMX_INLINE */ return NULL; } |