diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-09 04:27:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-09 04:50:56 +0200 |
| commit | 6841c8c5791e857a3327411f23c13b0d28f69f1f (patch) | |
| tree | 37f670ac509799ee0f4a067e2f632cc28a587082 /libavcodec/psymodel.c | |
| parent | 25308afbb2f7d6d9cb1e36476bc5aa0b3831c703 (diff) | |
| parent | 847aaec682f2bbfaac55ee623364dd4527e0f341 (diff) | |
| download | ffmpeg-6841c8c5791e857a3327411f23c13b0d28f69f1f.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
log: Fix an oob array read.
cosmetics: trim trailing whitespace in postproc
Ban strncpy() it's too easy to misuse.
psymodel: Remove wrapper functions.
aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
regtest: remove redundant flags in jpg test
regtest: use run_ffmpeg in do_image_formats
regtest: simplify encoding functions
ffmpeg.c: check for interlaced flag in the correct place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/psymodel.c')
| -rw-r--r-- | libavcodec/psymodel.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index 8bd5b8bdd8..133a85f5c1 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -45,19 +45,6 @@ av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, return 0; } -FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, - const int16_t *audio, const int16_t *la, - int channel, int prev_type) -{ - return ctx->model->window(ctx, audio, la, channel, prev_type); -} - -void ff_psy_set_band_info(FFPsyContext *ctx, int channel, - const float *coeffs, const FFPsyWindowInfo *wi) -{ - ctx->model->analyze(ctx, channel, coeffs, wi); -} - av_cold void ff_psy_end(FFPsyContext *ctx) { if (ctx->model->end) |