aacenc: shorten name of ff_aac_adjust_common_prediction

To keep it similar to the other functions which are all named *_pred.

libavcodec/aaccoder.c

@@ -912,7 +912,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
         quantize_and_encode_band,
         ff_aac_encode_tns_info,
         ff_aac_encode_main_pred,
-        ff_aac_adjust_common_prediction,
+        ff_aac_adjust_common_pred,
         ff_aac_apply_main_pred,
         ff_aac_apply_tns,
         set_special_band_scalefactors,
@@ -929,7 +929,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
         quantize_and_encode_band,
         ff_aac_encode_tns_info,
         ff_aac_encode_main_pred,
-        ff_aac_adjust_common_prediction,
+        ff_aac_adjust_common_pred,
         ff_aac_apply_main_pred,
         ff_aac_apply_tns,
         set_special_band_scalefactors,
@@ -946,7 +946,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
         quantize_and_encode_band,
         ff_aac_encode_tns_info,
         ff_aac_encode_main_pred,
-        ff_aac_adjust_common_prediction,
+        ff_aac_adjust_common_pred,
         ff_aac_apply_main_pred,
         ff_aac_apply_tns,
         set_special_band_scalefactors,
@@ -963,7 +963,7 @@ AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
         quantize_and_encode_band,
         ff_aac_encode_tns_info,
         ff_aac_encode_main_pred,
-        ff_aac_adjust_common_prediction,
+        ff_aac_adjust_common_pred,
         ff_aac_apply_main_pred,
         ff_aac_apply_tns,
         set_special_band_scalefactors,

libavcodec/aacenc.c

@@ -718,8 +718,8 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
                         s->coder->search_for_pred(s, sce);
                     if (cpe->ch[ch].ics.predictor_present) pred_mode = 1;
                 }
-                if (s->coder->adjust_common_prediction)
-                    s->coder->adjust_common_prediction(s, cpe);
+                if (s->coder->adjust_common_pred)
+                    s->coder->adjust_common_pred(s, cpe);
                 for (ch = 0; ch < chans; ch++) {
                     sce = &cpe->ch[ch];
                     s->cur_channel = start_ch + ch;

libavcodec/aacenc.h

@@ -61,7 +61,7 @@ typedef struct AACCoefficientsEncoder {
                                      int scale_idx, int cb, const float lambda, int rtz);
     void (*encode_tns_info)(struct AACEncContext *s, SingleChannelElement *sce);
     void (*encode_main_pred)(struct AACEncContext *s, SingleChannelElement *sce);
-    void (*adjust_common_prediction)(struct AACEncContext *s, ChannelElement *cpe);
+    void (*adjust_common_pred)(struct AACEncContext *s, ChannelElement *cpe);
     void (*apply_main_pred)(struct AACEncContext *s, SingleChannelElement *sce);
     void (*apply_tns_filt)(struct AACEncContext *s, SingleChannelElement *sce);
     void (*set_special_band_scalefactors)(struct AACEncContext *s, SingleChannelElement *sce);

libavcodec/aacenc_pred.c

@@ -148,7 +148,7 @@ static inline int update_counters(IndividualChannelStream *ics, int inc)
     return 0;
 }
 
-void ff_aac_adjust_common_prediction(AACEncContext *s, ChannelElement *cpe)
+void ff_aac_adjust_common_pred(AACEncContext *s, ChannelElement *cpe)
 {
     int start, w, w2, g, i, count = 0;
     SingleChannelElement *sce0 = &cpe->ch[0];

libavcodec/aacenc_pred.h

@@ -40,7 +40,7 @@
 #define PRED_SFB_START 10
 
 void ff_aac_apply_main_pred(AACEncContext *s, SingleChannelElement *sce);
-void ff_aac_adjust_common_prediction(AACEncContext *s, ChannelElement *cpe);
+void ff_aac_adjust_common_pred(AACEncContext *s, ChannelElement *cpe);
 void ff_aac_search_for_pred(AACEncContext *s, SingleChannelElement *sce);
 void ff_aac_encode_main_pred(AACEncContext *s, SingleChannelElement *sce);