From 913db29442d85f34228e41e3666534593e744fce Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Wed, 18 Oct 2017 13:43:49 +0300 Subject: [PATCH] ffmpeg: fix an issue in HEVC patch that leads to inclusion of ARM NEON code even when NEON is disabled --- .../patches/ffmpeg-99.1001-pfcd_hevc_optimisations.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1001-pfcd_hevc_optimisations.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-99.1001-pfcd_hevc_optimisations.patch index bf0f7ebdbb..0935db2569 100644 --- a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1001-pfcd_hevc_optimisations.patch +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-99.1001-pfcd_hevc_optimisations.patch @@ -29153,7 +29153,7 @@ index 0000000000..b8bfad915e +#include "rpi_sand_fn_pw.h" +#undef PW + -+#if defined(HAVE_NEON) && defined(__arm__) ++#if HAVE_NEON && ARCH_ARM +void rpi_sand128b_stripe_to_8_10(uint8_t * dest, const uint8_t * src1, const uint8_t * src2, unsigned int lines); +#endif + @@ -29199,7 +29199,7 @@ index 0000000000..b8bfad915e + // We make no effort to copy an exact width - round up to nearest src stripe + // as we will always have storage in dest for that + -+#if defined(HAVE_NEON) && defined(__arm__) ++#if HAVE_NEON && ARCH_ARM + if (shr == 3 && src_stride1 == 128) { + for (j = 0; j + n < w; j += dst_stride1) { + uint8_t * d = dst + j * dst_stride2;