[FFmpeg-cvslog] fftools/ffmpeg_filter: also remove display matrix side data from buffered frames

[James Almer]

ffmpeg | branch: release/7.1 | James Almer <jamrial at gmail.com> | Thu Feb 27 23:38:09 2025 -0300| [f023d2c61b3c178cb6d279ff51472ca16f239674] | committer: James Almer

fftools/ffmpeg_filter: also remove display matrix side data from buffered frames

Some frames may be buffered before a complex filtergraph can be configured.
This change ensures the side data removal in the cases where autorotation is
enabled also applies to them.

Fixes ticket #11487

Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 01f63ef0b44fa70d87edaf52f19fcdb2ae7446b3)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f023d2c61b3c178cb6d279ff51472ca16f239674
---

 fftools/ffmpeg_filter.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 38c7676a7e..3ef6818c72 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -1998,6 +1998,10 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt)
             if (ifp->type_src == AVMEDIA_TYPE_SUBTITLE) {
                 sub2video_frame(&ifp->ifilter, tmp, !fgt->graph);
             } else {
+                if (ifp->type_src == AVMEDIA_TYPE_VIDEO) {
+                    if (ifp->displaymatrix_applied)
+                        av_frame_remove_side_data(tmp, AV_FRAME_DATA_DISPLAYMATRIX);
+                }
                 ret = av_buffersrc_add_frame(ifp->filter, tmp);
             }
             av_frame_free(&tmp);