diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index 45fbc2dedf9d4cceeda2736453262b21cb176d8a..50a246fb55f772d6339797835d5a03791868560b 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -1113,25 +1113,25 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe,
 }
 
 AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
-    {
+    [AAC_CODER_FAAC] = {
         search_for_quantizers_faac,
         encode_window_bands_info,
         quantize_and_encode_band,
         search_for_ms,
     },
-    {
+    [AAC_CODER_ANMR] = {
         search_for_quantizers_anmr,
         encode_window_bands_info,
         quantize_and_encode_band,
         search_for_ms,
     },
-    {
+    [AAC_CODER_TWOLOOP] = {
         search_for_quantizers_twoloop,
         codebook_trellis_rate,
         quantize_and_encode_band,
         search_for_ms,
     },
-    {
+    [AAC_CODER_FAST] = {
         search_for_quantizers_fast,
         encode_window_bands_info,
         quantize_and_encode_band,
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index cebdd181beada35a01767a79ae944475b6a10037..19e442a24bdad426f57e9d7f91e9e201f5378cdf 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -30,7 +30,12 @@
 #include "audio_frame_queue.h"
 #include "psymodel.h"
 
-#define AAC_CODER_NB 4
+#define AAC_CODER_FAAC    0
+#define AAC_CODER_ANMR    1
+#define AAC_CODER_TWOLOOP 2
+#define AAC_CODER_FAST    3
+
+#define AAC_CODER_NB      4
 
 typedef struct AACEncOptions {
     int stereo_mode;