Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'

[ffmpeg] / libavcodec / aacenc_ltp.c

diff --git a/libavcodec/aacenc_ltp.c b/libavcodec/aacenc_ltp.c
index e19f3cc2d74e1d9761eabb749ba020988fd0fb05..b9d43b470ad1701ea896045e39aede7df7637a5d 100644 (file)
--- a/libavcodec/aacenc_ltp.c
+++ b/libavcodec/aacenc_ltp.c
@@ -167,13 +167,13 @@ void ff_aac_search_for_ltp(AACEncContext *s, SingleChannelElement *sce,
 
     if (sce->ics.window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
         if (sce->ics.ltp.lag) {
-            memset(&sce->lcoeffs[0], 0.0f, 3072*sizeof(sce->lcoeffs[0]));
+            memset(&sce->ltp_state[0], 0, 3072*sizeof(sce->ltp_state[0]));
             memset(&sce->ics.ltp, 0, sizeof(LongTermPrediction));
         }
         return;
     }
 
-    if (!sce->ics.ltp.lag)
+    if (!sce->ics.ltp.lag || s->lambda > 120.0f)
         return;
 
     for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {