Merge commit '9e48de3cc86c732d9cebd496d6f0a2b7e7732754'

[ffmpeg] / libavfilter / vf_blend.c

diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 054c0d55d099dfb69b2523c19922397c378177cb..70c37c75da76d34697adc424a124e95705009a99 100644 (file)
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -524,19 +524,12 @@ static int config_output(AVFilterLink *outlink)
             av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n");
             return AVERROR(EINVAL);
         }
-        if (toplink->w                       != bottomlink->w ||
-            toplink->h                       != bottomlink->h ||
-            toplink->sample_aspect_ratio.num != bottomlink->sample_aspect_ratio.num ||
-            toplink->sample_aspect_ratio.den != bottomlink->sample_aspect_ratio.den) {
+        if (toplink->w != bottomlink->w || toplink->h != bottomlink->h) {
             av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "
-                   "(size %dx%d, SAR %d:%d) do not match the corresponding "
-                   "second input link %s parameters (%dx%d, SAR %d:%d)\n",
+                   "(size %dx%d) do not match the corresponding "
+                   "second input link %s parameters (size %dx%d)\n",
                    ctx->input_pads[TOP].name, toplink->w, toplink->h,
-                   toplink->sample_aspect_ratio.num,
-                   toplink->sample_aspect_ratio.den,
-                   ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h,
-                   bottomlink->sample_aspect_ratio.num,
-                   bottomlink->sample_aspect_ratio.den);
+                   ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h);
             return AVERROR(EINVAL);
         }
     }