aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-07 19:28:30 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-03-07 19:58:05 +0100
commit088ba9bc3e7629af08e50816c91fc8e84ec8f898 (patch)
tree487a82fb40ecb1811f54c0293713e44cd7621be3
parentb642e45d8ce81f89a76ef8720c3e7cb69ec5ace6 (diff)
downloadffmpeg-088ba9bc3e7629af08e50816c91fc8e84ec8f898.tar.gz
psymodel: dont apply lowpass filters with a cutoff close to the nyquist
The IIR filter numerically diverges in such cases, this could easily be fixed but would make the filter slower on some platforms Fixes Ticket2246 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fee5da6b0a79bed9dc849f216b6da1e03132b668)
-rw-r--r--libavcodec/psymodel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c
index a4a7cbb683..09dd83d315 100644
--- a/libavcodec/psymodel.c
+++ b/libavcodec/psymodel.c
@@ -106,7 +106,7 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av
if (!cutoff_coeff && avctx->codec_id == AV_CODEC_ID_AAC)
cutoff_coeff = 2.0 * AAC_CUTOFF(avctx) / avctx->sample_rate;
- if (cutoff_coeff)
+ if (cutoff_coeff && cutoff_coeff < 0.98)
ctx->fcoeffs = ff_iir_filter_init_coeffs(avctx, FF_FILTER_TYPE_BUTTERWORTH,
FF_FILTER_MODE_LOWPASS, FILT_ORDER,
cutoff_coeff, 0.0, 0.0);