[FFmpeg-cvslog] avfilter/vf_guided: Don't needlessly copy properties, fix potential NPD

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri May 14 11:22:31 2021 +0200| [a0ab83bf93c546c215be1f34becb90263c11632d] | committer: Andreas Rheinhardt

avfilter/vf_guided: Don't needlessly copy properties, fix potential NPD

ref_frame is owned by the framesync structure and should therefore not
be modified; furthermore, these properties that are copied don't seem to
be used at all, so copying is unnecessary. Finally copying when the
destination frame is NULL gives a guaranteed segfault.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavfilter/vf_guided.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c
index 6ded4c7c59..ea537e40c6 100644
--- a/libavfilter/vf_guided.c
+++ b/libavfilter/vf_guided.c
@@ -323,10 +323,6 @@ static int process_frame(FFFrameSync *fs)
     }
     av_frame_copy_props(out_frame, main_frame);
 
-    if (ctx->is_disabled || !ref_frame) {
-        av_frame_copy_props(ref_frame, main_frame);
-    }
-
     for (int plane = 0; plane < s->nb_planes; plane++) {
         if (!(s->planes & (1 << plane))) {
             av_image_copy_plane(out_frame->data[plane], out_frame->linesize[plane],