[vlc-commits] chroma: copy: Fix compilation for other architectures than x86

Martin Storsjö git at videolan.org
Mon Mar 19 12:15:46 CET 2018


vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Mon Mar 19 09:29:56 2018 +0200| [fc5615053fc74841aff2ba4ec725779808138cbe] | committer: Thomas Guillem

chroma: copy: Fix compilation for other architectures than x86

This fixes build breakage since 10de9cab52679326c1c05244bdc04b529e392c43.

(cherry picked from commit b118374094a16a7fbfdca8e11ed7aefa86b2bc38)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 modules/video_chroma/copy.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/video_chroma/copy.c b/modules/video_chroma/copy.c
index 72d99a5e03..d4358b441a 100644
--- a/modules/video_chroma/copy.c
+++ b/modules/video_chroma/copy.c
@@ -644,10 +644,13 @@ void CopyPacked(picture_t *dst, const uint8_t *src, const size_t src_pitch,
     assert(src); assert(src_pitch);
     assert(height);
 
+#ifdef CAN_COMPILE_SSE2
     if (vlc_CPU_SSE4_1())
-        SSE_CopyPlane(dst->p[0].p_pixels, dst->p[0].i_pitch, src, src_pitch,
-                      cache->buffer, cache->size, height, 0);
-    else
+        return SSE_CopyPlane(dst->p[0].p_pixels, dst->p[0].i_pitch, src, src_pitch,
+                             cache->buffer, cache->size, height, 0);
+#else
+    (void) cache;
+#endif
         CopyPlane(dst->p[0].p_pixels, dst->p[0].i_pitch, src, src_pitch,
                   height, 0);
 }



More information about the vlc-commits mailing list