diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-04 02:15:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-04 02:15:12 +0200 |
| commit | 2cae9809e2d59c7336fc2cccb97b82c7f764868a (patch) | |
| tree | 823d962b7237e515e14e2679084e5981d5b808a5 /libavcodec/ac3enc_float.c | |
| parent | 3c9bfb336867ccd32a6e8490930961bcc14b3fdc (diff) | |
| parent | 906fd03070c7dc39b4c937befa2c3559bccf7ba7 (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
fate: fix partial run when no samples path is specified
ARM: NEON fixed-point forward MDCT
ARM: NEON fixed-point FFT
lavf: bump minor version and add an APIChanges entry for avio changes
avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
avio: make url_fdopen internal.
avio: make url_open_dyn_packet_buf internal.
avio: avio_ prefix for url_close_dyn_buf
avio: avio_ prefix for url_open_dyn_buf
avio: introduce an AVIOContext.seekable field
ac3enc: use generic fixed-point mdct
lavfi: add fade filter
Change yadif to not use out of picture lines.
lavc: deprecate AVCodecContext.antialias_algo
lavc: mark mb_qmin/mb_qmax for removal on next major bump.
Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_float.c')
| -rw-r--r-- | libavcodec/ac3enc_float.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index faed30da50..d89880535e 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -69,17 +69,6 @@ static av_cold int mdct_init(AVCodecContext *avctx, AC3MDCTContext *mdct, /** - * Calculate a 512-point MDCT - * @param out 256 output frequency coefficients - * @param in 512 windowed input audio samples - */ -static void mdct512(AC3MDCTContext *mdct, float *out, float *in) -{ - mdct->fft.mdct_calc(&mdct->fft, out, in); -} - - -/** * Apply KBD window to input samples prior to MDCT. */ static void apply_window(DSPContext *dsp, float *output, const float *input, |