@@ -1222,24 +1222,28 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {

         search_for_quantizers_faac,

         encode_window_bands_info,

         quantize_and_encode_band,

+        set_special_band_scalefactors,

         search_for_ms,

     },

     [AAC_CODER_ANMR] = {

         search_for_quantizers_anmr,

         encode_window_bands_info,

         quantize_and_encode_band,

+        set_special_band_scalefactors,

         search_for_ms,

     },

     [AAC_CODER_TWOLOOP] = {

         search_for_quantizers_twoloop,

         codebook_trellis_rate,

         quantize_and_encode_band,

+        set_special_band_scalefactors,

         search_for_ms,

     },

     [AAC_CODER_FAST] = {

         search_for_quantizers_fast,

         encode_window_bands_info,

         quantize_and_encode_band,

+        set_special_band_scalefactors,

         search_for_ms,

     },

 };

@@ -652,6 +652,9 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,

                     s->coder->search_for_ms(s, cpe, s->lambda);

                 }

             }

+            if (s->coder->set_special_band_scalefactors)

+                for (ch = 0; ch < chans; ch++)

+                    s->coder->set_special_band_scalefactors(s, &cpe->ch[ch]);

             adjust_frame_information(cpe, chans);

             if (chans == 2) {

                 put_bits(&s->pb, 1, cpe->common_window);

@@ -54,6 +54,7 @@ typedef struct AACCoefficientsEncoder {

                                      int win, int group_len, const float lambda);

     void (*quantize_and_encode_band)(struct AACEncContext *s, PutBitContext *pb, const float *in, int size,

                                      int scale_idx, int cb, const float lambda);

+    void (*set_special_band_scalefactors)(struct AACEncContext *s, SingleChannelElement *sce);

     void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe, const float lambda);

 } AACCoefficientsEncoder;