Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] avfilter/vf_scale: don't atempt to rescale AV_NOPTS_VALUE (PR #20603)
@ 2025-09-24 16:41 James Almer via ffmpeg-devel
  0 siblings, 0 replies; only message in thread
From: James Almer via ffmpeg-devel @ 2025-09-24 16:41 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: James Almer

PR #20603 opened by James Almer (jamrial)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20603
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20603.patch

Should fix issue #20589.


>From 37df42b97f8c6a0fb05c208276a46feb5512a493 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Wed, 24 Sep 2025 13:39:37 -0300
Subject: [PATCH] avfilter/vf_scale: don't atempt to rescale AV_NOPTS_VALUE

Should fix issue #20589.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavfilter/framesync.c | 2 +-
 libavfilter/vf_scale.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c
index 0d5779f830..8fc6d9d4a6 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 = frame->pts == AV_NOPTS_VALUE ? frame->pts : av_rescale_q(frame->pts, fs->in[in].time_base, fs->time_base);
     frame->pts = pts;
     fs->in[in].frame_next = frame;
     fs->in[in].pts_next   = pts;
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index c0cd1b96c6..ffb5a7bd1f 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 = fs->pts == AV_NOPTS_VALUE ? fs->pts : av_rescale_q(fs->pts, fs->time_base, outlink->time_base);
     return ff_filter_frame(outlink, out);
 
 err:
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2025-09-24 16:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-09-24 16:41 [FFmpeg-devel] [PATCH] avfilter/vf_scale: don't atempt to rescale AV_NOPTS_VALUE (PR #20603) James Almer via ffmpeg-devel

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ http://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git