Module: libav Branch: master Commit: 63fe79a3368cc53e6faf7fa265a9a1a8bec46a88
Author: Vittorio Giovara <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Mon Dec 5 14:16:21 2016 -0500 lavf: Drop deprecated hint to set muxer timebase Deprecated in 05/2014. --- libavformat/mux.c | 11 ----------- libavformat/version.h | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index dfda89d..cc92f2a 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -110,17 +110,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) st = s->streams[i]; par = st->codecpar; -#if FF_API_LAVF_CODEC_TB && FF_API_LAVF_AVCTX -FF_DISABLE_DEPRECATION_WARNINGS - if (!st->time_base.num && st->codec->time_base.num) { - av_log(s, AV_LOG_WARNING, "Using AVStream.codec.time_base as a " - "timebase hint to the muxer is deprecated. Set " - "AVStream.time_base instead.\n"); - avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS if (st->codecpar->codec_type == AVMEDIA_TYPE_UNKNOWN && diff --git a/libavformat/version.h b/libavformat/version.h index dad38d1..7060375 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -48,9 +48,7 @@ * 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. */ -#ifndef FF_API_LAVF_CODEC_TB -#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 58) -#endif + #ifndef FF_API_LAVF_FMT_RAWPICTURE #define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 59) #endif _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
