diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-10-12 19:54:45 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-08-28 23:59:24 +0200 |
| commit | a519583991c38d38503ab08357716513facc5725 (patch) | |
| tree | 680be0eb073b89921962a9215354256cb4b01ce4 /libswscale/x86 | |
| parent | a64f6a04ac5773aeff2003897455dadb9609f18b (diff) | |
| download | ffmpeg-a519583991c38d38503ab08357716513facc5725.tar.gz | |
swscale: x86: Hide arch-specific initialization details
Also give consistent names to init functions.
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 5416d48a4c..b94b14abbb 100644 --- a/libswscale/x86/Makefile +++ b/libswscale/x86/Makefile @@ -1,9 +1,9 @@ -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 059589f681..0b5f870272 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -302,18 +302,18 @@ 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); #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 d89a26f6a5..80a3ad9a3d 100644 --- a/libswscale/x86/swscale_template.c +++ b/libswscale/x86/swscale_template.c @@ -1555,7 +1555,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 419d5133f9..9968a8d49d 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -69,9 +69,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 (c->srcFormat != AV_PIX_FMT_YUV420P && @@ -111,7 +111,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; } |