proresenc_kostya: remove unneeded parameters

[ffmpeg] / libavcodec / idctdsp.c

diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
index 1c7a2aab74adfc86703887492e089d91d9d0d049..4ca07344dad20f197d9c564fb6c678a75117f2d0 100644 (file)
--- a/libavcodec/idctdsp.c
+++ b/libavcodec/idctdsp.c
@@ -80,27 +80,6 @@ av_cold void ff_init_scantable_permutation(uint8_t *idct_permutation,
     }
 }
 
-static void put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels,
-                                 int line_size)
-{
-    int i;
-
-    /* read the pixels */
-    for (i = 0; i < 8; i++) {
-        pixels[0] = av_clip_uint8(block[0]);
-        pixels[1] = av_clip_uint8(block[1]);
-        pixels[2] = av_clip_uint8(block[2]);
-        pixels[3] = av_clip_uint8(block[3]);
-        pixels[4] = av_clip_uint8(block[4]);
-        pixels[5] = av_clip_uint8(block[5]);
-        pixels[6] = av_clip_uint8(block[6]);
-        pixels[7] = av_clip_uint8(block[7]);
-
-        pixels += line_size;
-        block  += 8;
-    }
-}
-
 static void put_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels,
                                  int line_size)
 {
@@ -154,26 +133,6 @@ static void put_signed_pixels_clamped_c(const int16_t *block,
     }
 }
 
-static void add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels,
-                                 int line_size)
-{
-    int i;
-
-    /* read the pixels */
-    for (i = 0; i < 8; i++) {
-        pixels[0] = av_clip_uint8(pixels[0] + block[0]);
-        pixels[1] = av_clip_uint8(pixels[1] + block[1]);
-        pixels[2] = av_clip_uint8(pixels[2] + block[2]);
-        pixels[3] = av_clip_uint8(pixels[3] + block[3]);
-        pixels[4] = av_clip_uint8(pixels[4] + block[4]);
-        pixels[5] = av_clip_uint8(pixels[5] + block[5]);
-        pixels[6] = av_clip_uint8(pixels[6] + block[6]);
-        pixels[7] = av_clip_uint8(pixels[7] + block[7]);
-        pixels   += line_size;
-        block    += 8;
-    }
-}
-
 static void add_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels,
                           int line_size)
 {
@@ -277,22 +236,22 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
             c->idct                  = ff_simple_idct_12;
             c->perm_type             = FF_IDCT_PERM_NONE;
         } else {
-        if (avctx->idct_algo == FF_IDCT_INT) {
-            c->idct_put  = jref_idct_put;
-            c->idct_add  = jref_idct_add;
-            c->idct      = ff_j_rev_dct;
-            c->perm_type = FF_IDCT_PERM_LIBMPEG2;
-        } else if (avctx->idct_algo == FF_IDCT_FAAN) {
-            c->idct_put  = ff_faanidct_put;
-            c->idct_add  = ff_faanidct_add;
-            c->idct      = ff_faanidct;
-            c->perm_type = FF_IDCT_PERM_NONE;
-        } else { // accurate/default
-            c->idct_put  = ff_simple_idct_put_8;
-            c->idct_add  = ff_simple_idct_add_8;
-            c->idct      = ff_simple_idct_8;
-            c->perm_type = FF_IDCT_PERM_NONE;
-        }
+            if (avctx->idct_algo == FF_IDCT_INT) {
+                c->idct_put  = jref_idct_put;
+                c->idct_add  = jref_idct_add;
+                c->idct      = ff_j_rev_dct;
+                c->perm_type = FF_IDCT_PERM_LIBMPEG2;
+            } else if (avctx->idct_algo == FF_IDCT_FAAN) {
+                c->idct_put  = ff_faanidct_put;
+                c->idct_add  = ff_faanidct_add;
+                c->idct      = ff_faanidct;
+                c->perm_type = FF_IDCT_PERM_NONE;
+            } else { // accurate/default
+                c->idct_put  = ff_simple_idct_put_8;
+                c->idct_add  = ff_simple_idct_add_8;
+                c->idct      = ff_simple_idct_8;
+                c->perm_type = FF_IDCT_PERM_NONE;
+            }
         }
     }
 
@@ -300,7 +259,7 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
     c->put_signed_pixels_clamped = put_signed_pixels_clamped_c;
     c->add_pixels_clamped        = add_pixels_clamped_c;
 
-    if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVIDMMX)
+    if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVID)
         ff_xvididct_init(c, avctx);
 
     if (ARCH_ALPHA)