vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Aug 31 09:07:39 2015 +0200| [01fb5009d81c4d9629983b5082f73886d5c2b50f] | committer: Rafaël Carré
SWSCALE: fix compilation with 4.x (cherry picked from commit 2b23857c68622edda76b72b74aeb3d943ee277c9) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=01fb5009d81c4d9629983b5082f73886d5c2b50f --- 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 4e0ecf1..26d0d6f 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> @@ -235,6 +236,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; @@ -248,6 +250,7 @@ static int GetSwsCpuMask(void) if( vlc_CPU_ALTIVEC() ) i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC; #endif +#endif return i_sws_cpu; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
