aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-05-29 21:41:37 +0300
committerMartin Storsjö <martin@martin.st>2013-05-30 02:17:37 +0300
commit86113667c0fc6cded65b94fb57262da09c06594b (patch)
tree75712ddc64c8390e00068f0112f88f4b50d76cf9
parentefb7968cfe8b285ab4f27b363719b7c92d19ec74 (diff)
downloadffmpeg-86113667c0fc6cded65b94fb57262da09c06594b.tar.gz
arm: Include hpeldsp_neon.o if h264qpel is enabled
A few of the h264qpel neon functions are shared with other hpeldsp functions in this file. This fixes standalone compilation of the h264 decoder on arm. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavcodec/arm/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 2cb7449d98..875c3cc9c5 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -71,7 +71,8 @@ NEON-OBJS-$(CONFIG_H264CHROMA) += arm/h264cmc_neon.o
NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
arm/h264idct_neon.o
NEON-OBJS-$(CONFIG_H264PRED) += arm/h264pred_neon.o
-NEON-OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_neon.o
+NEON-OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_neon.o \
+ arm/hpeldsp_neon.o
NEON-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_neon.o \
arm/hpeldsp_neon.o
NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \