diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 16:37:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:38:04 -0300 |
| commit | d2484639bc205112f3841b14424b7744a92fd5e1 (patch) | |
| tree | 6a28aeaa53e1b4a25554d9198db978889642bdb9 /libavcodec | |
| parent | 2ccd00dabd5ab4fa2550377be823a521df80c141 (diff) | |
| parent | 48bb0da050329e5111b00a12dfc154b7e78fb3a3 (diff) | |
| download | ffmpeg-d2484639bc205112f3841b14424b7744a92fd5e1.tar.gz | |
Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
* commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3':
lavc: Drop deprecated way of setting audio delay on encode
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/encode.c | 4 | ||||
| -rw-r--r-- | libavcodec/utils.c | 5 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 12 deletions
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 |