From: Måns Rullgård <mans@mansr.com>
Date: Tue, 6 Oct 2009 21:55:37 +0000 (+0000)
Subject: ARM: enable ARMv4 add_pixels_clamped
X-Git-Tag: android-x86-4.4-r1~25051
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf57bea6fb32a320191f9f0721b352fc33c87826;p=android-x86%2Fexternal-ffmpeg.git

ARM: enable ARMv4 add_pixels_clamped

Somehow this function was never used.

Originally committed as revision 20185 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/arm/dsputil_init_arm.c b/libavcodec/arm/dsputil_init_arm.c
index c1aa9797d7..eecccc97b5 100644
--- a/libavcodec/arm/dsputil_init_arm.c
+++ b/libavcodec/arm/dsputil_init_arm.c
@@ -47,8 +47,8 @@ CALL_2X_PIXELS(ff_put_no_rnd_pixels16_x2_arm,  ff_put_no_rnd_pixels8_x2_arm, 8)
 CALL_2X_PIXELS(ff_put_no_rnd_pixels16_y2_arm,  ff_put_no_rnd_pixels8_y2_arm, 8)
 CALL_2X_PIXELS(ff_put_no_rnd_pixels16_xy2_arm, ff_put_no_rnd_pixels8_xy2_arm,8)
 
-void ff_add_pixels_clamped_ARM(short *block, unsigned char *dest,
-                                      int line_size);
+void ff_add_pixels_clamped_ARM(const DCTELEM *block, uint8_t *dest,
+                               int line_size);
 
 /* XXX: those functions should be suppressed ASAP when all IDCTs are
    converted */
@@ -98,6 +98,8 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
         }
     }
 
+    c->add_pixels_clamped = ff_add_pixels_clamped_ARM;
+
     c->put_pixels_tab[0][0] = ff_put_pixels16_arm;
     c->put_pixels_tab[0][1] = ff_put_pixels16_x2_arm;
     c->put_pixels_tab[0][2] = ff_put_pixels16_y2_arm;