[FFmpeg-cvslog] aacsbr: prevent multiple ff_aac_sbr_ctx_init()

Michael Niedermayer git at videolan.org
Fri Sep 23 22:57:05 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 23 22:31:57 2011 +0200| [ad51833a1a0a31ea39fa5542c1ec3851feb6630c] | committer: Michael Niedermayer

aacsbr: prevent multiple ff_aac_sbr_ctx_init()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/aacsbr.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 10b8daf..a213827 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -131,6 +131,8 @@ av_cold void ff_aac_sbr_init(void)
 av_cold void ff_aac_sbr_ctx_init(AACContext *ac, SpectralBandReplication *sbr)
 {
     float mdct_scale;
+    if(sbr->mdct.mdct_bits)
+        return;
     sbr->kx[0] = sbr->kx[1] = 32; //Typo in spec, kx' inits to 32
     sbr->data[0].e_a[1] = sbr->data[1].e_a[1] = -1;
     sbr->data[0].synthesis_filterbank_samples_offset = SBR_SYNTHESIS_BUF_SIZE - (1280 - 128);



More information about the ffmpeg-cvslog mailing list