1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae'

* commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae':
  dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-08 17:25:26 +01:00
commit df98b36aa6
2 changed files with 2 additions and 0 deletions

View File

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

View File

@ -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,