Mercurial > mplayer.hg
comparison libswscale/swscale.c @ 30292:9086459837a0
Revert r30331, which broke compilation.
swScale_C is not templated if any optimization is to be used and
!runtime_cpudetect.
| author | stefano |
|---|---|
| date | Sat, 16 Jan 2010 19:51:26 +0000 |
| parents | 2961ce981a2b |
| children | 826441351ad5 |
comparison
equal
deleted
inserted
replaced
| 30291:6719a8bcc039 | 30292:9086459837a0 |
|---|---|
| 1861 sws_init_swScale_3DNow(c); | 1861 sws_init_swScale_3DNow(c); |
| 1862 return swScale_3DNow; | 1862 return swScale_3DNow; |
| 1863 } else if (flags & SWS_CPU_CAPS_MMX) { | 1863 } else if (flags & SWS_CPU_CAPS_MMX) { |
| 1864 sws_init_swScale_MMX(c); | 1864 sws_init_swScale_MMX(c); |
| 1865 return swScale_MMX; | 1865 return swScale_MMX; |
| 1866 } | 1866 } else { |
| 1867 sws_init_swScale_C(c); | |
| 1868 return swScale_C; | |
| 1869 } | |
| 1870 | |
| 1867 #else | 1871 #else |
| 1868 #if ARCH_PPC | 1872 #if ARCH_PPC |
| 1869 if (flags & SWS_CPU_CAPS_ALTIVEC) { | 1873 if (flags & SWS_CPU_CAPS_ALTIVEC) { |
| 1870 sws_init_swScale_altivec(c); | 1874 sws_init_swScale_altivec(c); |
| 1871 return swScale_altivec; | 1875 return swScale_altivec; |
| 1872 } | 1876 } else { |
| 1873 #endif | 1877 sws_init_swScale_C(c); |
| 1878 return swScale_C; | |
| 1879 } | |
| 1880 #endif | |
| 1881 sws_init_swScale_C(c); | |
| 1882 return swScale_C; | |
| 1874 #endif /* ARCH_X86 && CONFIG_GPL */ | 1883 #endif /* ARCH_X86 && CONFIG_GPL */ |
| 1875 #else //CONFIG_RUNTIME_CPUDETECT | 1884 #else //CONFIG_RUNTIME_CPUDETECT |
| 1876 #if COMPILE_TEMPLATE_MMX2 | 1885 #if COMPILE_TEMPLATE_MMX2 |
| 1877 sws_init_swScale_MMX2(c); | 1886 sws_init_swScale_MMX2(c); |
| 1878 return swScale_MMX2; | 1887 return swScale_MMX2; |
| 1883 sws_init_swScale_MMX(c); | 1892 sws_init_swScale_MMX(c); |
| 1884 return swScale_MMX; | 1893 return swScale_MMX; |
| 1885 #elif COMPILE_TEMPLATE_ALTIVEC | 1894 #elif COMPILE_TEMPLATE_ALTIVEC |
| 1886 sws_init_swScale_altivec(c); | 1895 sws_init_swScale_altivec(c); |
| 1887 return swScale_altivec; | 1896 return swScale_altivec; |
| 1888 #endif | 1897 #else |
| 1889 #endif //!CONFIG_RUNTIME_CPUDETECT | |
| 1890 | |
| 1891 sws_init_swScale_C(c); | 1898 sws_init_swScale_C(c); |
| 1892 return swScale_C; | 1899 return swScale_C; |
| 1900 #endif | |
| 1901 #endif //!CONFIG_RUNTIME_CPUDETECT | |
| 1893 } | 1902 } |
| 1894 | 1903 |
| 1895 static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, | 1904 static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, |
| 1896 int srcSliceH, uint8_t* dstParam[], int dstStride[]) | 1905 int srcSliceH, uint8_t* dstParam[], int dstStride[]) |
| 1897 { | 1906 { |