From 61cf151ebd87b56096be0fbee64c291a15b7cdf1 Mon Sep 17 00:00:00 2001
From: Rob Sykes <robs@users.sourceforge.net>
Date: Sun, 15 May 2016 12:46:43 +0100
Subject: [PATCH] make explicit avcodec dependency on avutil; avfft needs
 32-byte alignment

---
 CMakeLists.txt | 2 +-
 src/simd.c     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5852f0c..69e6425 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ if (WITH_AVFFT)
   endif ()
 endif ()
 
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD_FOUND)
+if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD_FOUND))
   find_package (LibAVUtil)
   if (AVUTIL_FOUND)
     include_directories (${AVUTIL_INCLUDE_DIRS})
diff --git a/src/simd.c b/src/simd.c
index 7659ab9..48d440f 100644
--- a/src/simd.c
+++ b/src/simd.c
@@ -6,8 +6,14 @@
 #include <stdlib.h>
 #include "simd.h"
 #include "simd-dev.h"
+#include "soxr-config.h"
+
+#if AVCODEC_FOUND
+  #define SIMD_ALIGNMENT (sizeof(double) * 4)
+#else
+  #define SIMD_ALIGNMENT (sizeof(float) * 4)
+#endif
 
-#define SIMD_ALIGNMENT (sizeof(float) * 4)
 
 void * _soxr_simd_aligned_malloc(size_t size)
 {