doc/demuxers.texi: avoid comma splice in image2 documentation

[ffmpeg] / libavcodec / psymodel.c

diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c
index a17aecc422bec399c1662800798515106e13fb48..bdd2509f352b329760d77ab7a1ba91da3202eaf6 100644 (file)
--- a/libavcodec/psymodel.c
+++ b/libavcodec/psymodel.c
@@ -100,6 +100,9 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av
     if (avctx->cutoff > 0)
         cutoff_coeff = 2.0 * avctx->cutoff / avctx->sample_rate;
 
+    if (!cutoff_coeff && avctx->codec_id == CODEC_ID_AAC)
+        cutoff_coeff = 2.0 * AAC_CUTOFF(avctx) / avctx->sample_rate;
+
     if (cutoff_coeff)
     ctx->fcoeffs = ff_iir_filter_init_coeffs(avctx, FF_FILTER_TYPE_BUTTERWORTH,
                                              FF_FILTER_MODE_LOWPASS, FILT_ORDER,