avcodec/sbcdsp_data: Make data static

This data is only used by sbcdsp.c, so delete sbcdsp_data.h,
make a header out of sbcdsp_data.c and make the data contained
therein static.

Signed-off-by: Andreas Rheinhardt <[email protected]>

Author: mkver

libavcodec/Makefile

@@ -717,7 +717,7 @@ OBJS-$(CONFIG_SUBVIEWER_DECODER)       += subviewerdec.o ass.o
 OBJS-$(CONFIG_SUNRAST_DECODER)         += sunrast.o
 OBJS-$(CONFIG_SUNRAST_ENCODER)         += sunrastenc.o
 OBJS-$(CONFIG_SBC_DECODER)             += sbcdec.o sbc.o
-OBJS-$(CONFIG_SBC_ENCODER)             += sbcenc.o sbc.o sbcdsp.o sbcdsp_data.o
+OBJS-$(CONFIG_SBC_ENCODER)             += sbcenc.o sbc.o sbcdsp.o
 OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.o svq1.o h263data.o
 OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.o svq1.o  h263data.o  \
                                           h263.o ituh263enc.o

libavcodec/sbcdsp.c

@@ -107,26 +107,26 @@ static inline void sbc_analyze_4b_4s_simd(SBCDSPContext *s,
                                           int16_t *x, int32_t *out, int out_stride)
 {
     /* Analyze blocks */
-    s->sbc_analyze_4(x + 12, out, ff_sbcdsp_analysis_consts_fixed4_simd_odd);
+    s->sbc_analyze_4(x + 12, out, sbcdsp_analysis_consts_fixed4_simd_odd);
     out += out_stride;
-    s->sbc_analyze_4(x + 8, out, ff_sbcdsp_analysis_consts_fixed4_simd_even);
+    s->sbc_analyze_4(x + 8, out, sbcdsp_analysis_consts_fixed4_simd_even);
     out += out_stride;
-    s->sbc_analyze_4(x + 4, out, ff_sbcdsp_analysis_consts_fixed4_simd_odd);
+    s->sbc_analyze_4(x + 4, out, sbcdsp_analysis_consts_fixed4_simd_odd);
     out += out_stride;
-    s->sbc_analyze_4(x + 0, out, ff_sbcdsp_analysis_consts_fixed4_simd_even);
+    s->sbc_analyze_4(x + 0, out, sbcdsp_analysis_consts_fixed4_simd_even);
 }
 
 static inline void sbc_analyze_4b_8s_simd(SBCDSPContext *s,
                                           int16_t *x, int32_t *out, int out_stride)
 {
     /* Analyze blocks */
-    s->sbc_analyze_8(x + 24, out, ff_sbcdsp_analysis_consts_fixed8_simd_odd);
+    s->sbc_analyze_8(x + 24, out, sbcdsp_analysis_consts_fixed8_simd_odd);
     out += out_stride;
-    s->sbc_analyze_8(x + 16, out, ff_sbcdsp_analysis_consts_fixed8_simd_even);
+    s->sbc_analyze_8(x + 16, out, sbcdsp_analysis_consts_fixed8_simd_even);
     out += out_stride;
-    s->sbc_analyze_8(x + 8, out, ff_sbcdsp_analysis_consts_fixed8_simd_odd);
+    s->sbc_analyze_8(x + 8, out, sbcdsp_analysis_consts_fixed8_simd_odd);
     out += out_stride;
-    s->sbc_analyze_8(x + 0, out, ff_sbcdsp_analysis_consts_fixed8_simd_even);
+    s->sbc_analyze_8(x + 0, out, sbcdsp_analysis_consts_fixed8_simd_even);
 }
 
 static inline void sbc_analyze_1b_8s_simd_even(SBCDSPContext *s,
@@ -137,15 +137,15 @@ static inline void sbc_analyze_1b_8s_simd_odd(SBCDSPContext *s,
                                               int16_t *x, int32_t *out,
                                               int out_stride)
 {
-    s->sbc_analyze_8(x, out, ff_sbcdsp_analysis_consts_fixed8_simd_odd);
+    s->sbc_analyze_8(x, out, sbcdsp_analysis_consts_fixed8_simd_odd);
     s->sbc_analyze_8s = sbc_analyze_1b_8s_simd_even;
 }
 
 static inline void sbc_analyze_1b_8s_simd_even(SBCDSPContext *s,
                                                int16_t *x, int32_t *out,
                                                int out_stride)
 {
-    s->sbc_analyze_8(x, out, ff_sbcdsp_analysis_consts_fixed8_simd_even);
+    s->sbc_analyze_8(x, out, sbcdsp_analysis_consts_fixed8_simd_even);
     s->sbc_analyze_8s = sbc_analyze_1b_8s_simd_odd;
 }
 

libavcodec/sbcdsp.h

@@ -32,10 +32,11 @@
 #ifndef AVCODEC_SBCDSP_H
 #define AVCODEC_SBCDSP_H
 
+#include <stdint.h>
+
 #include "libavutil/mem_internal.h"
 
 #include "sbc.h"
-#include "sbcdsp_data.h"
 
 #define SCALE_OUT_BITS 15
 #define SBC_X_BUFFER_SIZE 328