# HG changeset patch # User mru # Date 1267915005 0 # Node ID 84963c795459a866075b3c1a6a006110837bb1f0 # Parent 1cd8731bbe7fd40777611de30ec5eab3a4f8652c Move some prototypes from dsputil.c to reasonable header files diff -r 1cd8731bbe7f -r 84963c795459 ac3dec.h --- a/ac3dec.h Sat Mar 06 22:36:41 2010 +0000 +++ b/ac3dec.h Sat Mar 06 22:36:45 2010 +0000 @@ -179,4 +179,7 @@ */ 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 -r 1cd8731bbe7f -r 84963c795459 dsputil.c --- a/dsputil.c Sat Mar 06 22:36:41 2010 +0000 +++ b/dsputil.c Sat Mar 06 22:36:45 2010 +0000 @@ -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 -r 1cd8731bbe7f -r 84963c795459 lpc.h --- a/lpc.h Sat Mar 06 22:36:41 2010 +0000 +++ b/lpc.h Sat Mar 06 22:36:45 2010 +0000 @@ -45,6 +45,9 @@ 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 -r 1cd8731bbe7f -r 84963c795459 png.h --- a/png.h Sat Mar 06 22:36:41 2010 +0000 +++ b/png.h Sat Mar 06 22:36:45 2010 +0000 @@ -73,4 +73,6 @@ /* 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 -r 1cd8731bbe7f -r 84963c795459 vorbis.h --- a/vorbis.h Sat Mar 06 22:36:41 2010 +0000 +++ b/vorbis.h Sat Mar 06 22:36:45 2010 +0000 @@ -41,6 +41,7 @@ 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))