diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
| commit | a41bf09d9c56215448f14fb086c9f882eb41ecac (patch) | |
| tree | 541da01619d95763ff0ee46ae0df50125505b3c4 /libavcodec/arm/Makefile | |
| parent | fb3f28ee289b9ea5106d5a7fa00a1018eb379e65 (diff) | |
| parent | 6906b19346ae8a330bfaa1c16ce535be10789723 (diff) | |
| download | ffmpeg-a41bf09d9c56215448f14fb086c9f882eb41ecac.tar.gz | |
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/Makefile')
| -rw-r--r-- | libavcodec/arm/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index b315d8da0e..ac486f47dc 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -30,6 +30,8 @@ OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_init_arm.o OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \ arm/rv40dsp_init_arm.o \ +OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_arm.o \ + OBJS += arm/dsputil_init_arm.o \ arm/dsputil_arm.o \ arm/fft_init_arm.o \ @@ -41,6 +43,9 @@ OBJS += arm/dsputil_init_arm.o \ ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_armv5te.o \ arm/mpegvideo_armv5te_s.o \ +ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \ + arm/videodsp_armv5te.o \ + ARMV5TE-OBJS += arm/dsputil_init_armv5te.o \ arm/simple_idct_armv5te.o \ |