remove impossible condition from msrle_decode_pal4()

[ffmpeg] / libavcodec / arm / dsputil_init_armv6.c

diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c
index 8dacc9df12a0a3a7e9b3da2cf1d2052bb6062814..3209062e5981c158fbc09b684a0429a60037bc34 100644 (file)
--- a/libavcodec/arm/dsputil_init_armv6.c
+++ b/libavcodec/arm/dsputil_init_armv6.c
@@ -50,6 +50,26 @@ void ff_add_pixels_clamped_armv6(const DCTELEM *block,
                                  uint8_t *restrict pixels,
                                  int line_size);
 
+void ff_get_pixels_armv6(DCTELEM *block, const uint8_t *pixels, int stride);
+void ff_diff_pixels_armv6(DCTELEM *block, const uint8_t *s1,
+                          const uint8_t *s2, int stride);
+
+int ff_pix_abs16_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
+                       int line_size, int h);
+int ff_pix_abs16_x2_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
+                          int line_size, int h);
+int ff_pix_abs16_y2_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
+                          int line_size, int h);
+
+int ff_pix_abs8_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
+                       int line_size, int h);
+
+int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
+                   int line_size, int h);
+
+int ff_pix_norm1_armv6(uint8_t *pix, int line_size);
+int ff_pix_sum_armv6(uint8_t *pix, int line_size);
+
 void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx)
 {
     if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO ||
@@ -82,4 +102,20 @@ void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx)
     c->avg_pixels_tab[1][0] = ff_avg_pixels8_armv6;
 
     c->add_pixels_clamped = ff_add_pixels_clamped_armv6;
+    c->get_pixels = ff_get_pixels_armv6;
+    c->diff_pixels = ff_diff_pixels_armv6;
+
+    c->pix_abs[0][0] = ff_pix_abs16_armv6;
+    c->pix_abs[0][1] = ff_pix_abs16_x2_armv6;
+    c->pix_abs[0][2] = ff_pix_abs16_y2_armv6;
+
+    c->pix_abs[1][0] = ff_pix_abs8_armv6;
+
+    c->sad[0] = ff_pix_abs16_armv6;
+    c->sad[1] = ff_pix_abs8_armv6;
+
+    c->sse[0] = ff_sse16_armv6;
+
+    c->pix_norm1 = ff_pix_norm1_armv6;
+    c->pix_sum   = ff_pix_sum_armv6;
 }