mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

44 lines
1.0 KiB

  1. When altivec is disabled there is no swScale_altivec ...
  2. Additionally cleaned up the else case a bit.
  3. - Rene Rebe <rene@rocklinux.org>
  4. --- MPlayer-1.0pre4/postproc/swscale.c 2004-04-26 21:38:17.000000000 +0200
  5. +++ MPlayer-1.0pre4-fixed/postproc/swscale.c 2004-04-28 15:02:29.000000000 +0200
  6. @@ -1339,19 +1339,16 @@
  7. return swScale_3DNow;
  8. else if(flags & SWS_CPU_CAPS_MMX)
  9. return swScale_MMX;
  10. - else
  11. - return swScale_C;
  12. #else
  13. #ifdef ARCH_POWERPC
  14. +#ifdef HAVE_ALTIVEC
  15. if(flags & SWS_CPU_CAPS_ALTIVEC)
  16. return swScale_altivec;
  17. - else
  18. - return swScale_C;
  19. #endif
  20. - return swScale_C;
  21. #endif
  22. -#else //RUNTIME_CPUDETECT
  23. +#endif
  24. +#else //!RUNTIME_CPUDETECT
  25. #ifdef HAVE_MMX2
  26. return swScale_MMX2;
  27. #elif defined (HAVE_3DNOW)
  28. @@ -1360,10 +1357,9 @@
  29. return swScale_MMX;
  30. #elif defined (HAVE_ALTIVEC)
  31. return swScale_altivec;
  32. -#else
  33. - return swScale_C;
  34. #endif
  35. #endif //!RUNTIME_CPUDETECT
  36. + return swScale_C;
  37. }
  38. static int PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,