The branch, release/7.1 has been updated
via c0e599e9d83a80cf1002c62684ecd90ae8776efd (commit)
via 46293e9905f1bfd0e4576c7a5ac41a92cc6f4c4d (commit)
via 9403cdd6e86efa4992b9322436e07d76e32da66a (commit)
via a2a67282859904283f1008e1ce0a7f6bc1e71757 (commit)
from 9e3030bc440e07887b787ae4a5bf407ff8548c75 (commit)
- Log -----------------------------------------------------------------
commit c0e599e9d83a80cf1002c62684ecd90ae8776efd
Author: James Almer <[email protected]>
AuthorDate: Wed Sep 24 20:31:26 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Thu Nov 27 22:02:55 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 3319428d9c..420dc13dc5 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -1119,7 +1119,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
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 46293e9905f1bfd0e4576c7a5ac41a92cc6f4c4d
Author: James Almer <[email protected]>
AuthorDate: Wed Sep 24 20:31:11 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Thu Nov 27 22:02:43 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;
commit 9403cdd6e86efa4992b9322436e07d76e32da66a
Author: James Almer <[email protected]>
AuthorDate: Tue Nov 25 12:42:30 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Thu Nov 27 22:00:39 2025 -0300
avformat/iamf_parse: ensure the stream count in a scalable channel
representation is equal to the audio element's stream count
Signed-off-by: James Almer <[email protected]>
(cherry picked from commit faa382e5b196f2acb5bc5b159aaf06682291328b)
diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index b0a166ba1f..8ea9616ec7 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -414,6 +414,9 @@ static int scalable_channel_layout_config(void *s,
AVIOContext *pb,
}
+ if (k != audio_element->nb_substreams)
+ return AVERROR_INVALIDDATA;
+
return 0;
}
commit a2a67282859904283f1008e1ce0a7f6bc1e71757
Author: James Almer <[email protected]>
AuthorDate: Tue Nov 25 10:26:27 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Thu Nov 27 22:00:30 2025 -0300
avformat/iamf_parse: ensure each layout in an scalable channel
representation has an increasing number of channels
Fixes issue #21013
Signed-off-by: James Almer <[email protected]>
(cherry picked from commit 554ae5ada98cd44686ade995102d3aa2295d7b09)
diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index a7a2b7deb5..b0a166ba1f 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -398,6 +398,9 @@ static int scalable_channel_layout_config(void *s,
AVIOContext *pb,
.nb_channels =
substream_count +
coupled_substream_count };
+ if (i && ch_layout.nb_channels <=
audio_element->element->layers[i-1]->ch_layout.nb_channels)
+ return AVERROR_INVALIDDATA;
+
for (int j = 0; j < substream_count; j++) {
IAMFSubStream *substream = &audio_element->substreams[k++];
-----------------------------------------------------------------------
Summary of changes:
libavfilter/framesync.c | 2 +-
libavfilter/vf_scale.c | 2 +-
libavformat/iamf_parse.c | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
