[FFmpeg-cvslog] r19494 - in trunk/libavcodec: Makefile arm/dsputil_neon.c

[diego]

Author: diego
Date: Thu Jul 23 00:33:33 2009
New Revision: 19494

Log:
Only compile in NEON optimizations for H.264 when the H.264 decoder is enabled.

Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/arm/dsputil_neon.c

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Thu Jul 23 00:30:20 2009	(r19493)
+++ trunk/libavcodec/Makefile	Thu Jul 23 00:33:33 2009	(r19494)
@@ -495,12 +495,13 @@ OBJS-$(HAVE_ARMVFP)                    +
 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)
 

Modified: trunk/libavcodec/arm/dsputil_neon.c
==============================================================================
--- trunk/libavcodec/arm/dsputil_neon.c	Thu Jul 23 00:30:20 2009	(r19493)
+++ trunk/libavcodec/arm/dsputil_neon.c	Thu Jul 23 00:33:33 2009	(r19494)
@@ -187,6 +187,7 @@ void ff_dsputil_init_neon(DSPContext *c,
     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,
     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;