Merge commit '18e6f087c4a50bede8449ee164778945480be50c'

[ffmpeg] / libavfilter / vf_delogo.c

diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 6c74b7540ba9a70d45bd53f13e82ef7523c4591e..d6b88d93eb7528c2e666d4eb7ad2ec5916962b4b 100644 (file)
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -229,11 +229,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
             avfilter_unref_bufferp(&in);
             return AVERROR(ENOMEM);
         }
-
         avfilter_copy_buffer_ref_props(out, in);
-
-        out->video->w = outlink->w;
-        out->video->h = outlink->h;
     }
 
     for (plane = 0; plane < 4 && in->data[plane]; plane++) {
@@ -283,4 +279,5 @@ AVFilter avfilter_vf_delogo = {
 
     .inputs    = avfilter_vf_delogo_inputs,
     .outputs   = avfilter_vf_delogo_outputs,
+    .priv_class = &delogo_class,
 };