Only compile in NEON optimizations for H.264 when the H.264 decoder is enabled.
authorDiego Biurrun <diego@biurrun.de>
Wed, 22 Jul 2009 22:33:33 +0000 (22:33 +0000)
committerDiego Biurrun <diego@biurrun.de>
Wed, 22 Jul 2009 22:33:33 +0000 (22:33 +0000)
Originally committed as revision 19494 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/Makefile
libavcodec/arm/dsputil_neon.c

index fb98a8b..f4616b6 100644 (file)
@@ -495,12 +495,13 @@ OBJS-$(HAVE_ARMVFP)                    += arm/dsputil_vfp.o             \
 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)
 
index 0649448..775a344 100644 (file)
@@ -187,6 +187,7 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
     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 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
     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;