diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 17:25:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 17:25:31 +0100 |
| commit | df98b36aa63cbca7ffdebb43028e125e74cfa93b (patch) | |
| tree | c5f243aa0d532e80859c7980d3c1492fc1ef01ad | |
| parent | 3a0e4f6c90db9a4dd5b94344c0a698bac6ed02e2 (diff) | |
| parent | 5c1c6e82261b856214499b9fef3a08bf3ff6e0ae (diff) | |
| download | ffmpeg-df98b36aa63cbca7ffdebb43028e125e74cfa93b.tar.gz | |
Merge commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae'
* commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae':
dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/dca.h | 1 | ||||
| -rw-r--r-- | libavcodec/x86/dca.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h index 86d20517a4..93393fcf92 100644 --- a/libavcodec/arm/dca.h +++ b/libavcodec/arm/dca.h @@ -24,6 +24,7 @@ #include <stdint.h> #include "config.h" +#include "libavcodec/dcadsp.h" #include "libavcodec/mathops.h" #if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB diff --git a/libavcodec/x86/dca.h b/libavcodec/x86/dca.h index 5636a7b38f..6415129b50 100644 --- a/libavcodec/x86/dca.h +++ b/libavcodec/x86/dca.h @@ -23,6 +23,7 @@ #if ARCH_X86_64 && HAVE_SSE2_INLINE # include "libavutil/x86/asm.h" # include "libavutil/mem.h" +#include "libavcodec/dcadsp.h" # define int8x8_fmul_int32 int8x8_fmul_int32 static inline void int8x8_fmul_int32(av_unused DCADSPContext *dsp, |