Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

[ffmpeg] / libavfilter / vf_hqdn3d.c

diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
index f3d445c78bcd22b23c98e11c81c3dfba93d1fe92..4ea4ac9aa0512b76ed9c1a319ec25c7169b749c5 100644 (file)
--- a/libavfilter/vf_hqdn3d.c
+++ b/libavfilter/vf_hqdn3d.c
@@ -327,9 +327,9 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
     AVFilterLink *outlink = inlink->dst->outputs[0];
 
     AVFilterBufferRef *out;
-    int direct, c;
+    int direct = 0, c;
 
-    if ((in->perms & AV_PERM_WRITE) && !(in->perms & AV_PERM_PRESERVE)) {
+    if (in->perms & AV_PERM_WRITE) {
         direct = 1;
         out = in;
     } else {
@@ -338,10 +338,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 (c = 0; c < 3; c++) {