Deprecated in 08/2014.
---
libavcodec/encode.c | 4 ----
libavcodec/utils.c | 5 -----
libavcodec/version.h | 3 ---
3 files changed, 12 deletions(-)
diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index fc27a070e1..9bb7ae5bde 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 61bb09b031..a6408cecbb 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 45c2dbd560..b60e9715aa 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
--
2.12.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
