diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 22:37:30 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 22:38:04 +0300 |
| commit | d2484639bc205112f3841b14424b7744a92fd5e1 (patch) | |
| tree | 6a28aeaa53e1b4a25554d9198db978889642bdb9 /libavcodec/utils.c | |
| parent | 2ccd00dabd5ab4fa2550377be823a521df80c141 (diff) | |
| parent | 48bb0da050329e5111b00a12dfc154b7e78fb3a3 (diff) | |
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/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 0 insertions, 5 deletions
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); |