Browse Source

avfilter/vf_cover_rect: clip rectangle if it is partly outside the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer 10 years ago
parent
commit
b4cc7d67f5
1 changed files with 11 additions and 0 deletions
  1. 11 0
      libavfilter/vf_cover_rect.c

+ 11 - 0
libavfilter/vf_cover_rect.c

@@ -163,6 +163,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         return ff_filter_frame(ctx->outputs[0], in);
     }
 
+    if (x < 0) {
+        w += x;
+        x = 0;
+    }
+    if (y < 0) {
+        h += y;
+        y = 0;
+    }
+    w = FFMIN(w, in->width  - x);
+    h = FFMIN(h, in->height - y);
+
     if (w > in->width || h > in->height || w <= 0 || h <= 0)
         return AVERROR(EINVAL);