[SCM] libav/experimental: standalone snow dsputil init

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7f624e80ef396c83d2e5a20a54b33552746ecebc
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Thu Aug 3 16:19:13 2006 +0000

    standalone snow dsputil init
    
    Originally committed as revision 5919 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c
index 7eea484..156d9c7 100644
--- a/libavcodec/ppc/dsputil_ppc.c
+++ b/libavcodec/ppc/dsputil_ppc.c
@@ -30,21 +30,12 @@ extern void gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h,
                          int x16, int y16, int rounder);
 extern void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block);
 extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
-extern void ff_snow_horizontal_compose97i_altivec(DWTELEM *b, int width);
-extern void ff_snow_vertical_compose97i_altivec(DWTELEM *b0, DWTELEM *b1,
-                                                DWTELEM *b2, DWTELEM *b3,
-                                                DWTELEM *b4, DWTELEM *b5,
-                                                int width);
-extern void ff_snow_inner_add_yblock_altivec(uint8_t *obmc,
-                                             const int obmc_stride,
-                                             uint8_t * * block, int b_w,
-                                             int b_h, int src_x, int src_y,
-                                             int src_stride, slice_buffer * sb,
-                                             int add, uint8_t * dst8);
 
-void dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx);
 void dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx);
+
+void dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx);
 void vc1dsp_init_altivec(DSPContext* c, AVCodecContext *avctx);
+void snow_init_altivec(DSPContext* c, AVCodecContext *avctx);
 
 #endif
 
@@ -276,15 +267,12 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
     if (has_altivec()) {
         mm_flags |= MM_ALTIVEC;
 
-        vc1dsp_init_altivec(c, avctx);
         dsputil_init_altivec(c, avctx);
+        snow_init_altivec(c, avctx);
+        vc1dsp_init_altivec(c, avctx);
 
         c->gmc1 = gmc1_altivec;
 
-        c->horizontal_compose97i = ff_snow_horizontal_compose97i_altivec;
-        c->vertical_compose97i = ff_snow_vertical_compose97i_altivec;
-        c->inner_add_yblock = ff_snow_inner_add_yblock_altivec;
-
 #ifdef CONFIG_ENCODERS
         if (avctx->dct_algo == FF_DCT_AUTO ||
             avctx->dct_algo == FF_DCT_ALTIVEC)
diff --git a/libavcodec/ppc/dsputil_snow_altivec.c b/libavcodec/ppc/dsputil_snow_altivec.c
index 8c39cda..27066de 100644
--- a/libavcodec/ppc/dsputil_snow_altivec.c
+++ b/libavcodec/ppc/dsputil_snow_altivec.c
@@ -776,3 +776,11 @@ void ff_snow_inner_add_yblock_altivec(uint8_t *obmc, const int obmc_stride,
                                      src_y, src_stride, sb, add, dst8);
     }
 }
+
+
+void snow_init_altivec(DSPContext* c, AVCodecContext *avctx)
+{
+        c->horizontal_compose97i = ff_snow_horizontal_compose97i_altivec;
+        c->vertical_compose97i = ff_snow_vertical_compose97i_altivec;
+        c->inner_add_yblock = ff_snow_inner_add_yblock_altivec;
+}

-- 
Libav/FFmpeg packaging