diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index fc27a070e1650054df618ac3384fc3c6f66f34cc..9bb7ae5bde0688ea55498903d28dfaf85e9f51d2 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -194,10 +194,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
 end:
     av_frame_free(&padded_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 61bb09b0313d7f777f3bf2d03e6c8b79edc0a3f7..a6408cecbb5e253fad40b2021a682afa3f23904f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -646,11 +646,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
         }
     }
 
-#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)) {
         /* validate channel layout from the decoder */
         if (avctx->channel_layout) {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 45c2dbd56092a4cb2bf0fc234ed2d4e7ae8d8f51..b60e9715aaa78fabaf5e7140275445c78310fef7 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_AUDIOENC_DELAY
-#define FF_API_AUDIOENC_DELAY    (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_AVCTX_TIMEBASE
 #define FF_API_AVCTX_TIMEBASE    (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif