make explicit avcodec dependency on avutil; avfft needs 32-byte alignment

master
Rob Sykes 2016-05-15 12:46:43 +01:00
parent 71da011e7a
commit 61cf151ebd
2 changed files with 8 additions and 2 deletions

View File

@ -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})

View File

@ -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)
{