This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 687e061cb20765a2a67a04fa2914853a512a6fee Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 13:38:01 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:58 2026 +0200 fftools/ffmpeg: Remove deprecated -vsync/fps_mode drop Deprecated in commit 3dc319587f5bb96905f5984262e036c58a756c8c on 2023-12-18. Signed-off-by: Andreas Rheinhardt <[email protected]> --- fftools/ffmpeg.h | 4 ---- fftools/ffmpeg_filter.c | 9 +-------- fftools/ffmpeg_mux.c | 5 ----- fftools/ffmpeg_mux.h | 3 --- fftools/ffmpeg_mux_init.c | 4 ---- fftools/ffmpeg_opt.c | 6 ------ 6 files changed, 1 insertion(+), 30 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index c29e2dc545..4301cb73f0 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -53,7 +53,6 @@ // deprecated features #define FFMPEG_OPT_TOP 1 -#define FFMPEG_OPT_VSYNC_DROP 1 #define FFMPEG_OPT_VSYNC 1 #define FFMPEG_OPT_FILTER_SCRIPT 1 @@ -65,9 +64,6 @@ enum VideoSyncMethod { VSYNC_CFR, VSYNC_VFR, VSYNC_VSCFR, -#if FFMPEG_OPT_VSYNC_DROP - VSYNC_DROP, -#endif }; enum EncTimeBase { diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index a934508923..5b68d831d8 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2540,11 +2540,7 @@ static void video_sync_process(OutputFilterPriv *ofp, AVFrame *frame, if (delta0 < 0 && delta > 0 && - fps->vsync_method != VSYNC_PASSTHROUGH -#if FFMPEG_OPT_VSYNC_DROP - && fps->vsync_method != VSYNC_DROP -#endif - ) { + fps->vsync_method != VSYNC_PASSTHROUGH) { if (delta0 < -0.6) { av_log(ofp, AV_LOG_VERBOSE, "Past duration %f too large\n", -delta0); } else @@ -2583,9 +2579,6 @@ static void video_sync_process(OutputFilterPriv *ofp, AVFrame *frame, ofp->next_pts = llrint(sync_ipts); frame->duration = llrint(duration); break; -#if FFMPEG_OPT_VSYNC_DROP - case VSYNC_DROP: -#endif case VSYNC_PASSTHROUGH: ofp->next_pts = llrint(sync_ipts); frame->duration = llrint(duration); diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 25f66dd185..b408b02f2a 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -139,11 +139,6 @@ static int mux_fixup_ts(Muxer *mux, MuxStream *ms, AVPacket *pkt) { OutputStream *ost = &ms->ost; -#if FFMPEG_OPT_VSYNC_DROP - if (ost->type == AVMEDIA_TYPE_VIDEO && ms->ts_drop) - pkt->pts = pkt->dts = AV_NOPTS_VALUE; -#endif - // rescale timestamps to the stream timebase if (ost->type == AVMEDIA_TYPE_AUDIO && !ost->enc) { // use av_rescale_delta() for streamcopying audio, to preserve diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h index 4ca8ab73a4..f458cc882c 100644 --- a/fftools/ffmpeg_mux.h +++ b/fftools/ffmpeg_mux.h @@ -81,9 +81,6 @@ typedef struct MuxStream { int copy_initial_nonkeyframes; int copy_prior_start; int streamcopy_started; -#if FFMPEG_OPT_VSYNC_DROP - int ts_drop; -#endif AVRational frame_rate; AVRational max_frame_rate; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index a857b16118..abde897bf5 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -810,10 +810,6 @@ static int new_stream_video(Muxer *mux, const OptionsContext *o, *vsync_method = VSYNC_VSCFR; } } -#if FFMPEG_OPT_VSYNC_DROP - if (*vsync_method == VSYNC_DROP) - ms->ts_drop = 1; -#endif } return 0; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 8a892aec68..0acbdba41e 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -364,12 +364,6 @@ int parse_and_set_vsync(const char *arg, enum VideoSyncMethod *vsync_var, int fi if (!av_strcasecmp(arg, "cfr")) *vsync_var = VSYNC_CFR; else if (!av_strcasecmp(arg, "vfr")) *vsync_var = VSYNC_VFR; else if (!av_strcasecmp(arg, "passthrough")) *vsync_var = VSYNC_PASSTHROUGH; -#if FFMPEG_OPT_VSYNC_DROP - else if (!av_strcasecmp(arg, "drop")) { - av_log(NULL, AV_LOG_WARNING, "-vsync/fps_mode drop is deprecated\n"); - *vsync_var = VSYNC_DROP; - } -#endif else if (!is_global && !av_strcasecmp(arg, "auto")) *vsync_var = VSYNC_AUTO; else if (!is_global) { av_log(NULL, AV_LOG_FATAL, "Invalid value %s specified for fps_mode of #%d:%d.\n", arg, file_idx, st_idx); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
