diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index c961dbace1..71b1b14afc 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -257,10 +257,6 @@ end:
     av_frame_free(&padded_frame);
     av_free(extended_frame);
 
-#if FF_API_AUDIOENC_DELAY
-    avctx->delay = avctx->initial_padding;
-#endif
-
     return ret;
 }
 
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index caf988ee4e..6f6707a7c7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1008,11 +1008,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     ret=0;
 
-#if FF_API_AUDIOENC_DELAY
-    if (av_codec_is_encoder(avctx->codec))
-        avctx->delay = avctx->initial_padding;
-#endif
-
     if (av_codec_is_decoder(avctx->codec)) {
         if (!avctx->bit_rate)
             avctx->bit_rate = get_bit_rate(avctx);
diff --git a/libavcodec/version.h b/libavcodec/version.h
index aa2e6a173f..3dd58c448d 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -61,9 +61,6 @@
 /* XXX: don't forget to drop the -vismv documentation */
 #define FF_API_VISMV             (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_AUDIOENC_DELAY
-#define FF_API_AUDIOENC_DELAY    (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_VAAPI_CONTEXT
 #define FF_API_VAAPI_CONTEXT     (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif