This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 985ebb17490bd8c129328d08ae07c9db4d03356c Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 13:21:29 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:57 2026 +0200 fftools/ffmpeg_mux_init: Remove deprecated FFMPEG_OPT_ENC_TIME_BASE_NUM Deprecated in commit dff3a283cd8c71802d43fbbbfcf57fb479784a24 on 2023-07-23. Signed-off-by: Andreas Rheinhardt <[email protected]> --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_mux_init.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 9ed48d34cd..7adeddf071 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -52,7 +52,6 @@ #include "libswresample/swresample.h" // deprecated features -#define FFMPEG_OPT_ENC_TIME_BASE_NUM 1 #define FFMPEG_OPT_TOP 1 #define FFMPEG_OPT_FORCE_KF_SOURCE_NO_DROP 1 #define FFMPEG_OPT_VSYNC_DROP 1 diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index ef71a7bb54..ac706bf2d4 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1401,20 +1401,11 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, q = (AVRational){ ENC_TIME_BASE_FILTER, 0 }; } else { ret = av_parse_ratio(&q, enc_time_base, INT_MAX, 0, NULL); - if (ret < 0 || q.den <= 0 -#if !FFMPEG_OPT_ENC_TIME_BASE_NUM - || q.num < 0 -#endif - ) { + if (ret < 0 || q.den <= 0 || q.num < 0) { av_log(ost, AV_LOG_FATAL, "Invalid time base: %s\n", enc_time_base); ret = ret < 0 ? ret : AVERROR(EINVAL); goto fail; } -#if FFMPEG_OPT_ENC_TIME_BASE_NUM - if (q.num < 0) - av_log(ost, AV_LOG_WARNING, "-enc_time_base -1 is deprecated," - " use -enc_time_base demux\n"); -#endif } enc_tb = q; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
