Skip to content

V
vlc
Commit 2b23857c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

SWSCALE: fix compilation with 4.x

parent 7db8b377
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
modules/video_chroma/swscale.c
View file @ 2b23857c
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <vlc_cpu.h> #include <vlc_cpu.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#include <libswscale/version.h>
#ifdef __APPLE__ #ifdef __APPLE__
# include <TargetConditionals.h> # include <TargetConditionals.h>
...@@ -226,6 +227,7 @@ static int GetSwsCpuMask(void) ...@@ -226,6 +227,7 @@ static int GetSwsCpuMask(void)
{ {
int i_sws_cpu = 0; int i_sws_cpu = 0;
#if LIBSWSCALE_VERSION_MAJOR < 4
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
if( vlc_CPU_MMX() ) if( vlc_CPU_MMX() )
i_sws_cpu |= SWS_CPU_CAPS_MMX; i_sws_cpu |= SWS_CPU_CAPS_MMX;
...@@ -238,6 +240,7 @@ static int GetSwsCpuMask(void) ...@@ -238,6 +240,7 @@ static int GetSwsCpuMask(void)
#elif defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) #elif defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__)
if( vlc_CPU_ALTIVEC() ) if( vlc_CPU_ALTIVEC() )
i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC; i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC;
#endif
#endif #endif
return i_sws_cpu; return i_sws_cpu;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment