Mercurial > libavcodec.hg
changeset 9976:e52cd349e708 libavcodec
Only compile in NEON optimizations for H.264 when the H.264 decoder is enabled.
| author | diego |
|---|---|
| date | Wed, 22 Jul 2009 22:33:33 +0000 |
| parents | d6d7e8d4a04d |
| children | fd3505e85d89 |
| files | Makefile arm/dsputil_neon.c |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Jul 22 22:27:10 2009 +0000 +++ b/Makefile Wed Jul 22 22:33:33 2009 +0000 @@ -495,12 +495,13 @@ OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \ arm/mpegvideo_iwmmxt.o \ +NEON-OBJS-$(CONFIG_H264_DECODER) += arm/h264dsp_neon.o \ + arm/h264idct_neon.o \ + NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o OBJS-$(HAVE_NEON) += arm/dsputil_neon.o \ arm/dsputil_neon_s.o \ - arm/h264dsp_neon.o \ - arm/h264idct_neon.o \ arm/simple_idct_neon.o \ $(NEON-OBJS-yes)
--- a/arm/dsputil_neon.c Wed Jul 22 22:27:10 2009 +0000 +++ b/arm/dsputil_neon.c Wed Jul 22 22:33:33 2009 +0000 @@ -187,6 +187,7 @@ c->put_pixels_clamped = ff_put_pixels_clamped_neon; c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_neon; + if (CONFIG_H264_DECODER) { c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon; c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_neon; @@ -257,6 +258,7 @@ c->h264_idct_add16 = ff_h264_idct_add16_neon; c->h264_idct_add16intra = ff_h264_idct_add16intra_neon; c->h264_idct_add8 = ff_h264_idct_add8_neon; + } if (CONFIG_VP3_DECODER) { c->vp3_v_loop_filter = ff_vp3_v_loop_filter_neon;