From 3da1180409ba7d553f40a74bb61b2f7952bc84d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sat, 6 Mar 2010 22:36:45 +0000
Subject: [PATCH] Move some prototypes from dsputil.c to reasonable header
files
Originally committed as revision 22260 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/ac3dec.h | 3 +++
libavcodec/dsputil.c | 16 ++++------------
libavcodec/lpc.h | 3 +++
libavcodec/png.h | 2 ++
libavcodec/vorbis.h | 1 +
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h
index cc44a0300ad..78869b5e26e 100644
--- a/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@ -179,4 +179,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s);
*/
void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
+void ff_ac3_downmix_c(float (*samples)[256], float (*matrix)[2],
+ int out_ch, int in_ch, int len);
+
#endif /* AVCODEC_AC3DEC_H */
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 1670c236840..9709d4aab05 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -36,22 +36,14 @@
#include "snow.h"
#include "mpegvideo.h"
#include "config.h"
+#include "lpc.h"
+#include "ac3dec.h"
+#include "vorbis.h"
+#include "png.h"
/* snow.c */
void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, int decomposition_count);
-/* vorbis.c */
-void vorbis_inverse_coupling(float *mag, float *ang, int blocksize);
-
-/* ac3dec.c */
-void ff_ac3_downmix_c(float (*samples)[256], float (*matrix)[2], int out_ch, int in_ch, int len);
-
-/* lpc.c */
-void ff_lpc_compute_autocorr(const int32_t *data, int len, int lag, double *autoc);
-
-/* pngdec.c */
-void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp);
-
/* eaidct.c */
void ff_ea_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block);
diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h
index 05a1deea676..d3754f04d28 100644
--- a/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@@ -45,6 +45,9 @@ int ff_lpc_calc_coefs(DSPContext *s,
int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc,
int omethod, int max_shift, int zero_shift);
+void ff_lpc_compute_autocorr(const int32_t *data, int len, int lag,
+ double *autoc);
+
#ifdef LPC_USE_DOUBLE
#define LPC_TYPE double
#else
diff --git a/libavcodec/png.h b/libavcodec/png.h
index 97e81f5628a..7c0ab9f6c60 100644
--- a/libavcodec/png.h
+++ b/libavcodec/png.h
@@ -73,4 +73,6 @@ int ff_png_get_nb_channels(int color_type);
/* compute the row size of an interleaved pass */
int ff_png_pass_row_size(int pass, int bits_per_pixel, int width);
+void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp);
+
#endif /* AVCODEC_PNG_H */
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index 03d448a640a..ce9bead425b 100644
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -41,6 +41,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num);
void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
uint_fast16_t * y_list, int * flag,
int multiplier, float * out, int samples);
+void vorbis_inverse_coupling(float *mag, float *ang, int blocksize);
#define ilog(i) av_log2(2*(i))
--
GitLab