diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-11-21 16:30:00 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-11-22 23:01:51 +0100 |
| commit | c16bfb147df8a9d350e8a0dbc01937b78faf5949 (patch) | |
| tree | 4ec6e7977d6ea877a1e79db411135413e3149a4b /libswscale/x86/yuv2rgb.c | |
| parent | 56c2337004d5223ae03d08020ad3eb4faa1bebc6 (diff) | |
| download | ffmpeg-c16bfb147df8a9d350e8a0dbc01937b78faf5949.tar.gz | |
swscale: x86: Consistently use lowercase function name suffixes
Diffstat (limited to 'libswscale/x86/yuv2rgb.c')
| -rw-r--r-- | libswscale/x86/yuv2rgb.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 9968a8d49d..6f4f7f5451 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -54,7 +54,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL; #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT #define COMPILE_TEMPLATE_MMXEXT 0 -#define RENAME(a) a ## _MMX +#define RENAME(a) a ## _mmx #include "yuv2rgb_template.c" #endif /* HAVE_MMX_INLINE */ @@ -63,7 +63,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL; #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT #define COMPILE_TEMPLATE_MMXEXT 1 -#define RENAME(a) a ## _MMXEXT +#define RENAME(a) a ## _mmxext #include "yuv2rgb_template.c" #endif /* HAVE_MMXEXT_INLINE */ @@ -82,9 +82,9 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) if (cpu_flags & AV_CPU_FLAG_MMXEXT) { switch (c->dstFormat) { case AV_PIX_FMT_RGB24: - return yuv420_rgb24_MMXEXT; + return yuv420_rgb24_mmxext; case AV_PIX_FMT_BGR24: - return yuv420_bgr24_MMXEXT; + return yuv420_bgr24_mmxext; } } #endif @@ -94,21 +94,27 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) case AV_PIX_FMT_RGB32: if (c->srcFormat == AV_PIX_FMT_YUVA420P) { #if HAVE_7REGS && CONFIG_SWSCALE_ALPHA - return yuva420_rgb32_MMX; + return yuva420_rgb32_mmx; #endif break; - } else return yuv420_rgb32_MMX; + } else + return yuv420_rgb32_mmx; case AV_PIX_FMT_BGR32: if (c->srcFormat == AV_PIX_FMT_YUVA420P) { #if HAVE_7REGS && CONFIG_SWSCALE_ALPHA - return yuva420_bgr32_MMX; + return yuva420_bgr32_mmx; #endif break; - } else return yuv420_bgr32_MMX; - case AV_PIX_FMT_RGB24: return yuv420_rgb24_MMX; - case AV_PIX_FMT_BGR24: return yuv420_bgr24_MMX; - case AV_PIX_FMT_RGB565: return yuv420_rgb16_MMX; - case AV_PIX_FMT_RGB555: return yuv420_rgb15_MMX; + } else + return yuv420_bgr32_mmx; + case AV_PIX_FMT_RGB24: + return yuv420_rgb24_mmx; + case AV_PIX_FMT_BGR24: + return yuv420_bgr24_mmx; + case AV_PIX_FMT_RGB565: + return yuv420_rgb16_mmx; + case AV_PIX_FMT_RGB555: + return yuv420_rgb15_mmx; } } #endif /* HAVE_MMX_INLINE */ |