diff options
| author | Jean-Baptiste Kempf <jb@videolan.org> | 2012-10-05 09:12:04 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-10-10 15:28:50 +0200 |
| commit | 507dce2536fea4b78a9f4973f77e1fa20cfe1b81 (patch) | |
| tree | 136511f67a3fc6c4dda44dc9984225eec34f24d3 /libavcodec/arm/Makefile | |
| parent | 63a46c6101ffe0ba6a5f6e90d595583ecf943d0d (diff) | |
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
Assign NEON specific function pointers after runtime check via
av_get_cpu_flags().
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/arm/Makefile')
| -rw-r--r-- | libavcodec/arm/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index f537e4f3e2..acfd626291 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -26,6 +26,10 @@ ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \ OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o +OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_init_arm.o +OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \ + arm/rv40dsp_init_arm.o \ + OBJS += arm/dsputil_init_arm.o \ arm/dsputil_arm.o \ arm/fft_init_arm.o \ @@ -72,12 +76,8 @@ NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \ arm/synth_filter_neon.o \ NEON-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_neon.o -NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_init_neon.o \ - arm/rv34dsp_neon.o \ - -NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_neon.o \ - arm/rv34dsp_neon.o \ - arm/rv40dsp_init_neon.o \ +NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o +NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_neon.o \ arm/rv40dsp_neon.o \ arm/h264cmc_neon.o \ |