summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-08-27 21:05:52 +0200
committerDiego Biurrun <diego@biurrun.de>2012-08-27 21:05:52 +0200
commit3d868fe542e3f960f54d18c4baf87fc8e36c497c (patch)
treee62fda9fd6fb2f1878645fb9f73209e7b5f257e0
parentdafcbfe44361b0d3caa22b15bc95e38ba80af7e6 (diff)
downloadffmpeg-streaming-3d868fe542e3f960f54d18c4baf87fc8e36c497c.zip
ffmpeg-streaming-3d868fe542e3f960f54d18c4baf87fc8e36c497c.tar.gz
build: Restore dependency of acelp_filters.o on celp_math.o
-rw-r--r--libavcodec/Makefile6
-rw-r--r--libavcodec/acelp_pitch_delay.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c022e16..adbe1a3 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -84,11 +84,11 @@ OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o
OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o
OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \
- acelp_filters.o \
+ celp_math.o acelp_filters.o \
acelp_vectors.o \
acelp_pitch_delay.o
OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \
- acelp_filters.o \
+ celp_math.o acelp_filters.o \
acelp_vectors.o \
acelp_pitch_delay.o
OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o
@@ -332,7 +332,7 @@ OBJS-$(CONFIG_SGI_DECODER) += sgidec.o
OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \
- acelp_vectors.o \
+ celp_math.o acelp_vectors.o \
acelp_filters.o celp_filters.o \
sipr16k.o
OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c
index 1c84850..c091301 100644
--- a/libavcodec/acelp_pitch_delay.c
+++ b/libavcodec/acelp_pitch_delay.c
@@ -25,6 +25,7 @@
#include "avcodec.h"
#include "dsputil.h"
#include "acelp_pitch_delay.h"
+#include "celp_math.h"
int ff_acelp_decode_8bit_to_1st_delay3(int ac_index)
{
OpenPOWER on IntegriCloud