Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / sh4 / dsputil_sh4.c

diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c
index 905e8b15e00d08058838c04826e89aeeeb649c02..7deab41d623b0e156c604c97fd338e7aa5b600b5 100644 (file)
--- a/libavcodec/sh4/dsputil_sh4.c
+++ b/libavcodec/sh4/dsputil_sh4.c
@@ -56,7 +56,7 @@ static void idct_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
         int i;
         uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
-        idct_sh4(block);
+        ff_idct_sh4(block);
         for(i=0;i<8;i++) {
                 dest[0] = cm[block[0]];
                 dest[1] = cm[block[1]];
@@ -74,7 +74,7 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block)
 {
         int i;
         uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
-        idct_sh4(block);
+        ff_idct_sh4(block);
         for(i=0;i<8;i++) {
                 dest[0] = cm[dest[0]+block[0]];
                 dest[1] = cm[dest[1]+block[1]];
@@ -89,11 +89,11 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block)
         }
 }
 
-void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx)
+void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx)
 {
         const int idct_algo= avctx->idct_algo;
         const int high_bit_depth = avctx->bits_per_raw_sample > 8;
-        dsputil_init_align(c,avctx);
+        ff_dsputil_init_align(c,avctx);
 
         if (!high_bit_depth)
         c->clear_blocks = clear_blocks_sh4;
@@ -101,7 +101,7 @@ void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx)
             (idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_SH4)) {
                 c->idct_put = idct_put;
                 c->idct_add = idct_add;
-               c->idct     = idct_sh4;
+                c->idct     = ff_idct_sh4;
                 c->idct_permutation_type= FF_NO_IDCT_PERM;
         }
 }