diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-10-17 21:00:39 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-10-17 21:00:39 +0000 |
| commit | fde82ca7e4e72226da99d86a9fa9689136461d14 (patch) | |
| tree | 5060829d8c5971a2edae793e05d28895a06dbdcf /libavcodec/dsputil.c | |
| parent | a4cb675124a906126ba4ab307f0c17716f6d9adb (diff) | |
| download | ffmpeg-fde82ca7e4e72226da99d86a9fa9689136461d14.tar.gz | |
Move autocorrelation function from flacenc.c to lpc.c. Also rename the
corresponding dsputil functions and remove their dependency on the FLAC
encoder.
Fixes Issue1486.
Originally committed as revision 20266 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index be35ec3cff..aae86bcb21 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -45,8 +45,8 @@ 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); -/* flacenc.c */ -void ff_flac_compute_autocorr(const int32_t *data, int len, int lag, double *autoc); +/* 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); @@ -4837,9 +4837,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx) #if CONFIG_AC3_DECODER c->ac3_downmix = ff_ac3_downmix_c; #endif -#if CONFIG_FLAC_ENCODER - c->flac_compute_autocorr = ff_flac_compute_autocorr; -#endif + c->lpc_compute_autocorr = ff_lpc_compute_autocorr; c->vector_fmul = vector_fmul_c; c->vector_fmul_reverse = vector_fmul_reverse_c; c->vector_fmul_add = vector_fmul_add_c; |