[vlc-commits] SWSCALE: fix compilation with 4.x

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 31 09:07:39 2015 +0200| [2b23857c68622edda76b72b74aeb3d943ee277c9] | committer: Jean-Baptiste Kempf

SWSCALE: fix compilation with 4.x

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b23857c68622edda76b72b74aeb3d943ee277c9
---

 modules/video_chroma/swscale.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
index fd658ba..4f0beb1 100644
--- a/modules/video_chroma/swscale.c
+++ b/modules/video_chroma/swscale.c
@@ -36,6 +36,7 @@
 #include <vlc_cpu.h>
 
 #include <libswscale/swscale.h>
+#include <libswscale/version.h>
 
 #ifdef __APPLE__
 # include <TargetConditionals.h>
@@ -226,6 +227,7 @@ static int GetSwsCpuMask(void)
 {
     int i_sws_cpu = 0;
 
+#if LIBSWSCALE_VERSION_MAJOR < 4
 #if defined(__i386__) || defined(__x86_64__)
     if( vlc_CPU_MMX() )
         i_sws_cpu |= SWS_CPU_CAPS_MMX;
@@ -239,6 +241,7 @@ static int GetSwsCpuMask(void)
     if( vlc_CPU_ALTIVEC() )
         i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC;
 #endif
+#endif
 
     return i_sws_cpu;
 }