The branch, master has been updated
via b9cc8e32109bba3daec1cfb6a834e45f72266b46 (commit)
via 5614672d1bed49557f234639f7eeaf3b9c0385fe (commit)
from c605d2a7aefb8bb35237c63143151c7e11b1e7c4 (commit)
- Log -----------------------------------------------------------------
commit b9cc8e32109bba3daec1cfb6a834e45f72266b46
Author: James Almer <[email protected]>
AuthorDate: Wed Sep 24 20:31:26 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Fri Sep 26 12:24:04 2025 -0300
avfilter/vf_scale: don't attempt to rescale AV_NOPTS_VALUE
Finishes fixing issue #20589.
Signed-off-by: James Almer <[email protected]>
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index c0cd1b96c6..1ef1de8419 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -951,7 +951,7 @@ static int do_scale(FFFrameSync *fs)
goto err;
av_assert0(out);
- out->pts = av_rescale_q(fs->pts, fs->time_base, outlink->time_base);
+ out->pts = av_rescale_q_rnd(fs->pts, fs->time_base, outlink->time_base,
AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX);
return ff_filter_frame(outlink, out);
err:
commit 5614672d1bed49557f234639f7eeaf3b9c0385fe
Author: James Almer <[email protected]>
AuthorDate: Wed Sep 24 20:31:11 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Fri Sep 26 12:24:04 2025 -0300
avfilter/framesync: don't attempt to rescale AV_NOPTS_VALUE
Part of a fix for issue #20589.
Signed-off-by: James Almer <[email protected]>
diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c
index 0d5779f830..846d1c7e50 100644
--- a/libavfilter/framesync.c
+++ b/libavfilter/framesync.c
@@ -248,7 +248,7 @@ static void framesync_inject_frame(FFFrameSync *fs,
unsigned in, AVFrame *frame)
av_assert0(!fs->in[in].have_next);
av_assert0(frame);
- pts = av_rescale_q(frame->pts, fs->in[in].time_base, fs->time_base);
+ pts = av_rescale_q_rnd(frame->pts, fs->in[in].time_base, fs->time_base,
AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX);
frame->pts = pts;
fs->in[in].frame_next = frame;
fs->in[in].pts_next = pts;
-----------------------------------------------------------------------
Summary of changes:
libavfilter/framesync.c | 2 +-
libavfilter/vf_scale.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
