ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Oct 23 16:37:30 2017 -0300| [d2484639bc205112f3841b14424b7744a92fd5e1] | committer: James Almer
Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3' * commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3': lavc: Drop deprecated way of setting audio delay on encode Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2484639bc205112f3841b14424b7744a92fd5e1 --- 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 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 ====================================================================== diff --cc libavcodec/encode.c index c961dbace1,9bb7ae5bde..71b1b14afc --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@@ -255,12 -193,7 +255,8 @@@ int attribute_align_arg avcodec_encode_ end: av_frame_free(&padded_frame); + av_free(extended_frame); - #if FF_API_AUDIOENC_DELAY - avctx->delay = avctx->initial_padding; - #endif - return ret; } diff --cc libavcodec/utils.c index caf988ee4e,a6408cecbb..6f6707a7c7 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@@ -1006,16 -646,7 +1006,11 @@@ FF_ENABLE_DEPRECATION_WARNING } } + 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); /* validate channel layout from the decoder */ if (avctx->channel_layout) { int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); diff --cc libavcodec/version.h index aa2e6a173f,b60e9715aa..3dd58c448d --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -45,30 -45,10 +45,27 @@@ * FF_API_* defines may be placed below to indicate public API that will be * dropped at a future version bump. The defines themselves are not part of * the public API and may change, break or disappear at any time. + * + * @note, when bumping the major version it is recommended to manually + * disable each FF_API_* in its own commit instead of disabling them all + * at once through the bump. This improves the git bisect-ability of the change. */ +#ifndef FF_API_LOWRES +#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59) +#endif +#ifndef FF_API_DEBUG_MV +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) +#endif +#ifndef FF_API_VISMV +/* 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 #ifndef FF_API_AVCTX_TIMEBASE -#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) #endif #ifndef FF_API_MPV_OPT #define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
