mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 05:16:38 +00:00
Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
* commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3': lavc: Drop deprecated way of setting audio delay on encode Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
d2484639bc
@ -257,10 +257,6 @@ end:
|
|||||||
av_frame_free(&padded_frame);
|
av_frame_free(&padded_frame);
|
||||||
av_free(extended_frame);
|
av_free(extended_frame);
|
||||||
|
|
||||||
#if FF_API_AUDIOENC_DELAY
|
|
||||||
avctx->delay = avctx->initial_padding;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1008,11 +1008,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|||||||
|
|
||||||
ret=0;
|
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 (av_codec_is_decoder(avctx->codec)) {
|
||||||
if (!avctx->bit_rate)
|
if (!avctx->bit_rate)
|
||||||
avctx->bit_rate = get_bit_rate(avctx);
|
avctx->bit_rate = get_bit_rate(avctx);
|
||||||
|
@ -61,9 +61,6 @@
|
|||||||
/* XXX: don't forget to drop the -vismv documentation */
|
/* XXX: don't forget to drop the -vismv documentation */
|
||||||
#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_AUDIOENC_DELAY
|
|
||||||
#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_VAAPI_CONTEXT
|
#ifndef FF_API_VAAPI_CONTEXT
|
||||||
#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user