This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 631ac6d055 fftools/ffmpeg_filter: propagate display matrix side data
through the filterchain
631ac6d055 is described below
commit 631ac6d055b273c87feceb0c19ed62f211e8ef3b
Author: James Almer <[email protected]>
AuthorDate: Sat Jun 6 22:00:30 2026 -0300
Commit: James Almer <[email protected]>
CommitDate: Fri Jun 12 09:28:20 2026 -0300
fftools/ffmpeg_filter: propagate display matrix side data through the
filterchain
But only if autorotating is disabled.
Fixes issue #23383.
Signed-off-by: James Almer <[email protected]>
---
fftools/ffmpeg_filter.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 8ea89e2ec2..a934508923 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -2257,8 +2257,7 @@ static int ifilter_parameters_from_frame(InputFilter
*ifilter, const AVFrame *fr
for (int i = 0; i < frame->nb_side_data; i++) {
const AVSideDataDescriptor *desc =
av_frame_side_data_desc(frame->side_data[i]->type);
- if (!(desc->props & AV_SIDE_DATA_PROP_GLOBAL) ||
- frame->side_data[i]->type == AV_FRAME_DATA_DISPLAYMATRIX)
+ if (!(desc->props & AV_SIDE_DATA_PROP_GLOBAL))
continue;
ret = av_frame_side_data_clone(&ifp->side_data,
@@ -2269,8 +2268,11 @@ static int ifilter_parameters_from_frame(InputFilter
*ifilter, const AVFrame *fr
}
sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX);
- if (sd)
+ if (sd) {
memcpy(ifp->displaymatrix, sd->data, sizeof(ifp->displaymatrix));
+ if (ifp->opts.flags & IFILTER_FLAG_AUTOROTATE)
+ av_frame_side_data_remove(&ifp->side_data, &ifp->nb_side_data,
AV_FRAME_DATA_DISPLAYMATRIX);
+ }
ifp->displaymatrix_present = !!sd;
/* Copy downmix related side data to InputFilterPriv so it may be
propagated
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
