Browse code

Move some prototypes from dsputil.c to reasonable header files

Originally committed as revision 22260 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2010/03/07 07:36:45
Showing 5 changed files
... ...
@@ -179,4 +179,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s);
179 179
  */
180 180
 void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
181 181
 
182
+void ff_ac3_downmix_c(float (*samples)[256], float (*matrix)[2],
183
+                      int out_ch, int in_ch, int len);
184
+
182 185
 #endif /* AVCODEC_AC3DEC_H */
... ...
@@ -36,22 +36,14 @@
36 36
 #include "snow.h"
37 37
 #include "mpegvideo.h"
38 38
 #include "config.h"
39
+#include "lpc.h"
40
+#include "ac3dec.h"
41
+#include "vorbis.h"
42
+#include "png.h"
39 43
 
40 44
 /* snow.c */
41 45
 void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, int decomposition_count);
42 46
 
43
-/* vorbis.c */
44
-void vorbis_inverse_coupling(float *mag, float *ang, int blocksize);
45
-
46
-/* ac3dec.c */
47
-void ff_ac3_downmix_c(float (*samples)[256], float (*matrix)[2], int out_ch, int in_ch, int len);
48
-
49
-/* lpc.c */
50
-void ff_lpc_compute_autocorr(const int32_t *data, int len, int lag, double *autoc);
51
-
52
-/* pngdec.c */
53
-void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp);
54
-
55 47
 /* eaidct.c */
56 48
 void ff_ea_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block);
57 49
 
... ...
@@ -45,6 +45,9 @@ int ff_lpc_calc_coefs(DSPContext *s,
45 45
                       int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc,
46 46
                       int omethod, int max_shift, int zero_shift);
47 47
 
48
+void ff_lpc_compute_autocorr(const int32_t *data, int len, int lag,
49
+                             double *autoc);
50
+
48 51
 #ifdef LPC_USE_DOUBLE
49 52
 #define LPC_TYPE double
50 53
 #else
... ...
@@ -73,4 +73,6 @@ int ff_png_get_nb_channels(int color_type);
73 73
 /* compute the row size of an interleaved pass */
74 74
 int ff_png_pass_row_size(int pass, int bits_per_pixel, int width);
75 75
 
76
+void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp);
77
+
76 78
 #endif /* AVCODEC_PNG_H */
... ...
@@ -41,6 +41,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num);
41 41
 void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
42 42
                                   uint_fast16_t * y_list, int * flag,
43 43
                                   int multiplier, float * out, int samples);
44
+void vorbis_inverse_coupling(float *mag, float *ang, int blocksize);
44 45
 
45 46
 #define ilog(i) av_log2(2*(i))
46 47