[vlc-devel] [PATCH] swscale: fix compilation

Zhao Zhili wantlamy at gmail.com
Wed Feb 24 10:27:56 CET 2016


ffmpeg dropped SWS_CPU_CAPS without version bump
---
 modules/video_chroma/swscale.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
index f18017e..5b1bc46 100644
--- a/modules/video_chroma/swscale.c
+++ b/modules/video_chroma/swscale.c
@@ -227,7 +227,7 @@ static int GetSwsCpuMask(void)
 {
     int i_sws_cpu = 0;

-#if LIBSWSCALE_VERSION_MAJOR < 4
+#if (LIBSWSCALE_VERSION_MAJOR < 4) && defined(FF_API_SWS_CPU_CAPS)
 #if defined(__i386__) || defined(__x86_64__)
     if( vlc_CPU_MMX() )
         i_sws_cpu |= SWS_CPU_CAPS_MMX;
-- 
1.9.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20160224/10834820/attachment.html>


More information about the vlc-devel mailing list