diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-24 12:43:29 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-24 14:50:15 -0400 |
| commit | aaca69c130edf219110c616d2e236a3a27caf706 (patch) | |
| tree | 738461f9b053013da896462f949ab487a7bc2637 /libswscale/swscale.c | |
| parent | c4fd283a467031fdbde5bca0963b20d5911eca91 (diff) | |
| download | ffmpeg-aaca69c130edf219110c616d2e236a3a27caf706.tar.gz | |
swscale: remove swScale_{c,MMX,MMX2} duplication.
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 5b71a6f1c0..36b676bf06 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1214,18 +1214,13 @@ SwsFunc ff_getSwsFunc(SwsContext *c) sws_init_swScale_c(c); -#if HAVE_MMX2 - // ordered per speed fastest first - if (cpu_flags & AV_CPU_FLAG_MMX2) { - sws_init_swScale_MMX2(c); - return swScale_MMX2; - } else -#endif #if HAVE_MMX - if (cpu_flags & AV_CPU_FLAG_MMX) { + if (cpu_flags & AV_CPU_FLAG_MMX) sws_init_swScale_MMX(c); - return swScale_MMX; - } else +#endif +#if HAVE_MMX2 + if (cpu_flags & AV_CPU_FLAG_MMX2) + sws_init_swScale_MMX2(c); #endif #if HAVE_ALTIVEC if (cpu_flags & AV_CPU_FLAG_ALTIVEC) |