[FFmpeg-cvslog] avcodec/aacpsy: Remove always-true checks

Andreas Rheinhardt git at videolan.org
Fri Jun 6 18:31:19 EEST 2025


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Jun  3 18:17:51 2025 +0200| [d0a27e01a6492df753a6c8c5d2797f292215cd9a] | committer: Andreas Rheinhardt

avcodec/aacpsy: Remove always-true checks

Possible since 03cf10164578aed33f4d0cb5b69d63669c01a538.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0a27e01a6492df753a6c8c5d2797f292215cd9a
---

 libavcodec/aacpsy.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index 019be09fa3..ac7ae5b28d 100644
--- a/libavcodec/aacpsy.c
+++ b/libavcodec/aacpsy.c
@@ -593,7 +593,6 @@ static float calc_reduced_thr_3gpp(AacPsyBand *band, float min_snr,
     return thr;
 }
 
-#ifndef calc_thr_3gpp
 static void calc_thr_3gpp(const FFPsyWindowInfo *wi, const int num_bands, AacPsyChannel *pch,
                           const uint8_t *band_sizes, const float *coefs, const int cutoff)
 {
@@ -622,9 +621,7 @@ static void calc_thr_3gpp(const FFPsyWindowInfo *wi, const int num_bands, AacPsy
         }
     }
 }
-#endif /* calc_thr_3gpp */
 
-#ifndef psy_hp_filter
 static void psy_hp_filter(const float *firbuf, float *hpfsmpl, const float *psy_fir_coeffs)
 {
     int i, j;
@@ -641,7 +638,6 @@ static void psy_hp_filter(const float *firbuf, float *hpfsmpl, const float *psy_
         hpfsmpl[i] = (sum1 + sum2) * 32768.0f;
     }
 }
-#endif /* psy_hp_filter */
 
 /**
  * Calculate band thresholds as suggested in 3GPP TS26.403



More information about the ffmpeg-cvslog mailing list