[FFmpeg-cvslog] avcodec/alpha/dsputil_alpha: fix build

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  8 20:15:31 2014 +0200| [550bda741cfe0e471a70e40529a9ab02d31b7049] | committer: Michael Niedermayer

avcodec/alpha/dsputil_alpha: fix build

Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=550bda741cfe0e471a70e40529a9ab02d31b7049
---

 libavcodec/alpha/dsputil_alpha.c |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c
index a075c3a..ad98cfa 100644
--- a/libavcodec/alpha/dsputil_alpha.c
+++ b/libavcodec/alpha/dsputil_alpha.c
@@ -107,8 +107,10 @@ av_cold void ff_dsputil_init_alpha(DSPContext *c, AVCodecContext *avctx)
 
     /* amask clears all bits that correspond to present features.  */
     if (amask(AMASK_MVI) == 0) {
-        c->put_pixels_clamped = put_pixels_clamped_mvi_asm;
-        c->add_pixels_clamped = add_pixels_clamped_mvi_asm;
+//      Disabled as these have been moved to a different context
+//      Patch to update these is welcome!
+//         c->put_pixels_clamped = put_pixels_clamped_mvi_asm;
+//         c->add_pixels_clamped = add_pixels_clamped_mvi_asm;
 
         if (!high_bit_depth)
             c->get_pixels   = get_pixels_mvi;
@@ -122,14 +124,16 @@ av_cold void ff_dsputil_init_alpha(DSPContext *c, AVCodecContext *avctx)
         c->pix_abs[0][3]    = pix_abs16x16_xy2_mvi;
     }
 
-    put_pixels_clamped_axp_p = c->put_pixels_clamped;
-    add_pixels_clamped_axp_p = c->add_pixels_clamped;
-
-    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 &&
-        (avctx->idct_algo == FF_IDCT_AUTO ||
-         avctx->idct_algo == FF_IDCT_SIMPLEALPHA)) {
-        c->idct_put = ff_simple_idct_put_axp;
-        c->idct_add = ff_simple_idct_add_axp;
-        c->idct =     ff_simple_idct_axp;
-    }
+//      Disabled as these have been moved to a different context
+//      Patch to update these is welcome!
+//     put_pixels_clamped_axp_p = c->put_pixels_clamped;
+//     add_pixels_clamped_axp_p = c->add_pixels_clamped;
+//
+//     if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 &&
+//         (avctx->idct_algo == FF_IDCT_AUTO ||
+//          avctx->idct_algo == FF_IDCT_SIMPLEALPHA)) {
+//         c->idct_put = ff_simple_idct_put_axp;
+//         c->idct_add = ff_simple_idct_add_axp;
+//         c->idct =     ff_simple_idct_axp;
+//     }
 }