lavc: remove disabled FF_API_IDCT cruft

[ffmpeg] / libavcodec / intrax8dsp.c

diff --git a/libavcodec/intrax8dsp.c b/libavcodec/intrax8dsp.c
index 533d2d75fa5350782cd6a051bb0558054f2c48b1..1115945ebad9d61e538908f7fb9d3ac31d780575 100644 (file)
--- a/libavcodec/intrax8dsp.c
+++ b/libavcodec/intrax8dsp.c
@@ -1,27 +1,28 @@
 /*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
-* @file intrax8dsp.c
+* @file
  *@brief IntraX8 frame subdecoder image manipulation routines
  */
 
-#include "dsputil.h"
+#include "intrax8dsp.h"
+#include "libavutil/common.h"
 
 /*
 area positions, #3 is 1 pixel only, other are 8 pixels
@@ -61,7 +62,7 @@ area positions, #3 is 1 pixel only, other are 8 pixels
         note:   1|2 - mb_x==mb_y==0 - first block, use 0x80 value for all areas;
                 4   - mb_x>= (mb_width-1) last block in the row, interpolate area #5;
 */
-static void x8_setup_spacial_compensation(uint8_t *src, uint8_t *dst, int linesize,
+static void x8_setup_spatial_compensation(uint8_t *src, uint8_t *dst, int linesize,
            int * range, int * psum,  int edges){
     uint8_t * ptr;
     int sum;
@@ -147,15 +148,13 @@ static const uint16_t zero_prediction_weights[64*2] = {
     110, 1172,  144, 1107,  193, 1028,  254, 932,  317, 846,  366, 731,  458, 611,  499, 499
 };
 
-static void spacial_compensation_0(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_0(uint8_t *src , uint8_t *dst, int linesize){
     int i,j;
     int x,y;
     unsigned int p;//power divided by 2
     int a;
-    uint16_t left_sum[2][8];
-    uint16_t  top_sum[2][8];
-    memset(left_sum,0,2*8*sizeof(uint16_t));
-    memset( top_sum,0,2*8*sizeof(uint16_t));
+    uint16_t left_sum[2][8] = { { 0 } };
+    uint16_t  top_sum[2][8] = { { 0 } };
 
     for(i=0;i<8;i++){
         a=src[area2+7-i]<<4;
@@ -202,7 +201,7 @@ static void spacial_compensation_0(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_1(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_1(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -212,7 +211,7 @@ static void spacial_compensation_1(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_2(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_2(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -222,7 +221,7 @@ static void spacial_compensation_2(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_3(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_3(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -232,7 +231,7 @@ static void spacial_compensation_3(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_4(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_4(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -242,7 +241,7 @@ static void spacial_compensation_4(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_5(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_5(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -256,7 +255,7 @@ static void spacial_compensation_5(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_6(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_6(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -266,7 +265,7 @@ static void spacial_compensation_6(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_7(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_7(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -280,7 +279,7 @@ static void spacial_compensation_7(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_8(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_8(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -290,7 +289,7 @@ static void spacial_compensation_8(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_9(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_9(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -300,7 +299,7 @@ static void spacial_compensation_9(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_10(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_10(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -310,7 +309,7 @@ static void spacial_compensation_10(uint8_t *src , uint8_t *dst, int linesize){
         dst+=linesize;
     }
 }
-static void spacial_compensation_11(uint8_t *src , uint8_t *dst, int linesize){
+static void spatial_compensation_11(uint8_t *src , uint8_t *dst, int linesize){
     int x,y;
 
     for(y=0;y<8;y++){
@@ -413,20 +412,21 @@ static void x8_v_loop_filter(uint8_t *src, int stride, int qscale){
     x8_loop_filter(src, 1, stride, qscale);
 }
 
-void ff_intrax8dsp_init(DSPContext* dsp, AVCodecContext *avctx) {
-    dsp->x8_h_loop_filter=x8_h_loop_filter;
-    dsp->x8_v_loop_filter=x8_v_loop_filter;
-    dsp->x8_setup_spacial_compensation=x8_setup_spacial_compensation;
-    dsp->x8_spacial_compensation[0]=spacial_compensation_0;
-    dsp->x8_spacial_compensation[1]=spacial_compensation_1;
-    dsp->x8_spacial_compensation[2]=spacial_compensation_2;
-    dsp->x8_spacial_compensation[3]=spacial_compensation_3;
-    dsp->x8_spacial_compensation[4]=spacial_compensation_4;
-    dsp->x8_spacial_compensation[5]=spacial_compensation_5;
-    dsp->x8_spacial_compensation[6]=spacial_compensation_6;
-    dsp->x8_spacial_compensation[7]=spacial_compensation_7;
-    dsp->x8_spacial_compensation[8]=spacial_compensation_8;
-    dsp->x8_spacial_compensation[9]=spacial_compensation_9;
-    dsp->x8_spacial_compensation[10]=spacial_compensation_10;
-    dsp->x8_spacial_compensation[11]=spacial_compensation_11;
+av_cold void ff_intrax8dsp_init(IntraX8DSPContext *dsp)
+{
+    dsp->h_loop_filter=x8_h_loop_filter;
+    dsp->v_loop_filter=x8_v_loop_filter;
+    dsp->setup_spatial_compensation=x8_setup_spatial_compensation;
+    dsp->spatial_compensation[0]=spatial_compensation_0;
+    dsp->spatial_compensation[1]=spatial_compensation_1;
+    dsp->spatial_compensation[2]=spatial_compensation_2;
+    dsp->spatial_compensation[3]=spatial_compensation_3;
+    dsp->spatial_compensation[4]=spatial_compensation_4;
+    dsp->spatial_compensation[5]=spatial_compensation_5;
+    dsp->spatial_compensation[6]=spatial_compensation_6;
+    dsp->spatial_compensation[7]=spatial_compensation_7;
+    dsp->spatial_compensation[8]=spatial_compensation_8;
+    dsp->spatial_compensation[9]=spatial_compensation_9;
+    dsp->spatial_compensation[10]=spatial_compensation_10;
+    dsp->spatial_compensation[11]=spatial_compensation_11;
 }