diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-08-30 23:48:35 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-08-30 23:48:35 +0000 |
| commit | 0e107f7890338aad1190f23997562a6de3ca29e9 (patch) | |
| tree | 19aabb8cfbe56532fd84a4b68288b3c75baf5578 | |
| parent | 76dfe4ebc5c173dcbf75a09d0a2229803d7ae4ab (diff) | |
| download | ffmpeg-0e107f7890338aad1190f23997562a6de3ca29e9.tar.gz | |
psymodel: Const correct FFPsyWindowInfo.
Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/aacpsy.c | 2 | ||||
| -rw-r--r-- | libavcodec/psymodel.c | 2 | ||||
| -rw-r--r-- | libavcodec/psymodel.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index bcdbbd661d..b1bfc7b1a5 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -387,7 +387,7 @@ static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx, * Calculate band thresholds as suggested in 3GPP TS26.403 */ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, - const float *coefs, FFPsyWindowInfo *wi) + const float *coefs, const FFPsyWindowInfo *wi) { AacPsyContext *pctx = (AacPsyContext*) ctx->model_priv_data; AacPsyChannel *pch = &pctx->ch[channel]; diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index a85c29baaa..a2e469c5d7 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -53,7 +53,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, } void ff_psy_set_band_info(FFPsyContext *ctx, int channel, - const float *coeffs, FFPsyWindowInfo *wi) + const float *coeffs, const FFPsyWindowInfo *wi) { ctx->model->analyze(ctx, channel, coeffs, wi); } diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index bc19d49f73..fc2f6d954c 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -72,7 +72,7 @@ typedef struct FFPsyModel { const char *name; int (*init) (FFPsyContext *apc); FFPsyWindowInfo (*window)(FFPsyContext *ctx, const int16_t *audio, const int16_t *la, int channel, int prev_type); - void (*analyze)(FFPsyContext *ctx, int channel, const float *coeffs, FFPsyWindowInfo *wi); + void (*analyze)(FFPsyContext *ctx, int channel, const float *coeffs, const FFPsyWindowInfo *wi); void (*end) (FFPsyContext *apc); } FFPsyModel; @@ -116,7 +116,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, * @param wi window information */ void ff_psy_set_band_info(FFPsyContext *ctx, int channel, const float *coeffs, - FFPsyWindowInfo *wi); + const FFPsyWindowInfo *wi); /** * Cleanup model context at the end. |