Browse code

avfilter/vf_maskedclamp: ignore SAR from all inputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Paul B Mahol authored on 2017/11/12 19:19:19
Showing 1 changed files
... ...
@@ -235,27 +235,15 @@ static int config_output(AVFilterLink *outlink)
235 235
         av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n");
236 236
         return AVERROR(EINVAL);
237 237
     }
238
-    if (base->w                       != dark->w ||
239
-        base->h                       != dark->h ||
240
-        base->sample_aspect_ratio.num != dark->sample_aspect_ratio.num ||
241
-        base->sample_aspect_ratio.den != dark->sample_aspect_ratio.den ||
242
-        base->w                       != bright->w ||
243
-        base->h                       != bright->h ||
244
-        base->sample_aspect_ratio.num != bright->sample_aspect_ratio.num ||
245
-        base->sample_aspect_ratio.den != bright->sample_aspect_ratio.den) {
238
+    if (base->w != dark->w   || base->h != dark->h ||
239
+        base->w != bright->w || base->h != bright->h) {
246 240
         av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "
247
-               "(size %dx%d, SAR %d:%d) do not match the corresponding "
248
-               "second input link %s parameters (%dx%d, SAR %d:%d) "
249
-               "and/or third input link %s parameters (%dx%d, SAR %d:%d)\n",
241
+               "(size %dx%d) do not match the corresponding "
242
+               "second input link %s parameters (%dx%d) "
243
+               "and/or third input link %s parameters (size %dx%d)\n",
250 244
                ctx->input_pads[0].name, base->w, base->h,
251
-               base->sample_aspect_ratio.num,
252
-               base->sample_aspect_ratio.den,
253 245
                ctx->input_pads[1].name, dark->w, dark->h,
254
-               dark->sample_aspect_ratio.num,
255
-               dark->sample_aspect_ratio.den,
256
-               ctx->input_pads[2].name, bright->w, bright->h,
257
-               bright->sample_aspect_ratio.num,
258
-               bright->sample_aspect_ratio.den);
246
+               ctx->input_pads[2].name, bright->w, bright->h);
259 247
         return AVERROR(EINVAL);
260 248
     }
261 249