diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index a5cebcf..adc5d59 100644
a
|
b
|
DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
|
199 | 199 | |
200 | 200 | void sws_rgb2rgb_init(int flags) |
201 | 201 | { |
202 | | #if HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX |
| 202 | #if HAVE_SSE2 || HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX |
203 | 203 | if (flags & SWS_CPU_CAPS_SSE2) |
204 | 204 | rgb2rgb_init_SSE2(); |
205 | 205 | else if (flags & SWS_CPU_CAPS_MMX2) |
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index c0e4db3..bf41180 100644
a
|
b
|
untested special converters
|
62 | 62 | #include "rgb2rgb.h" |
63 | 63 | #include "libavutil/intreadwrite.h" |
64 | 64 | #include "libavutil/x86_cpu.h" |
65 | | #include "libavutil/cpu.h" |
66 | 65 | #include "libavutil/avutil.h" |
67 | 66 | #include "libavutil/mathematics.h" |
68 | 67 | #include "libavutil/bswap.h" |
… |
… |
SwsFunc ff_getSwsFunc(SwsContext *c)
|
1314 | 1313 | #if CONFIG_RUNTIME_CPUDETECT |
1315 | 1314 | int flags = c->flags; |
1316 | 1315 | |
1317 | | int cpuflags = av_get_cpu_flags(); |
1318 | | |
1319 | | flags |= (cpuflags & AV_CPU_FLAG_MMX ? SWS_CPU_CAPS_MMX : 0); |
1320 | | flags |= (cpuflags & AV_CPU_FLAG_MMX2 ? SWS_CPU_CAPS_MMX2 : 0); |
1321 | | flags |= (cpuflags & AV_CPU_FLAG_3DNOW ? SWS_CPU_CAPS_3DNOW : 0); |
1322 | | |
1323 | 1316 | #if ARCH_X86 |
1324 | 1317 | // ordered per speed fastest first |
1325 | 1318 | if (flags & SWS_CPU_CAPS_MMX2) { |
diff --git a/libswscale/utils.c b/libswscale/utils.c
index a343bf2..ecd0a76 100644
a
|
b
|
|
41 | 41 | #include "rgb2rgb.h" |
42 | 42 | #include "libavutil/intreadwrite.h" |
43 | 43 | #include "libavutil/x86_cpu.h" |
| 44 | #include "libavutil/cpu.h" |
44 | 45 | #include "libavutil/avutil.h" |
45 | 46 | #include "libavutil/bswap.h" |
46 | 47 | #include "libavutil/opt.h" |
… |
… |
static int update_flags_cpu(int flags)
|
742 | 743 | |SWS_CPU_CAPS_ALTIVEC |
743 | 744 | |SWS_CPU_CAPS_BFIN); |
744 | 745 | flags |= ff_hardcodedcpuflags(); |
| 746 | #else /* !CONFIG_RUNTIME_CPUDETECT */ |
| 747 | int cpuflags = av_get_cpu_flags(); |
| 748 | |
| 749 | flags |= (cpuflags & AV_CPU_FLAG_SSE2 ? SWS_CPU_CAPS_SSE2 : 0); |
| 750 | flags |= (cpuflags & AV_CPU_FLAG_MMX ? SWS_CPU_CAPS_MMX : 0); |
| 751 | flags |= (cpuflags & AV_CPU_FLAG_MMX2 ? SWS_CPU_CAPS_MMX2 : 0); |
| 752 | flags |= (cpuflags & AV_CPU_FLAG_3DNOW ? SWS_CPU_CAPS_3DNOW : 0); |
745 | 753 | #endif /* CONFIG_RUNTIME_CPUDETECT */ |
746 | 754 | return flags; |
747 | 755 | } |