diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-09-03 13:37:43 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-09-03 13:37:43 +0200 |
| commit | 06ed3768c88cce44ba157ec81676acf96e50a61a (patch) | |
| tree | e84203c6c7052fc9733d2f8c148958305329e274 /libavfilter/vf_displace.c | |
| parent | f19e4118e9ca392f89d3c264aa8490b7d9ac3284 (diff) | |
| download | ffmpeg-06ed3768c88cce44ba157ec81676acf96e50a61a.tar.gz | |
avfilter/vf_displace: remove useless requirement that SAR matches between input streams
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_displace.c')
| -rw-r--r-- | libavfilter/vf_displace.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c index 6100a249c6..a894021bff 100644 --- a/libavfilter/vf_displace.c +++ b/libavfilter/vf_displace.c @@ -280,27 +280,17 @@ static int config_output(AVFilterLink *outlink) av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); return AVERROR(EINVAL); } - if (srclink->w != xlink->w || - srclink->h != xlink->h || - srclink->sample_aspect_ratio.num != xlink->sample_aspect_ratio.num || - srclink->sample_aspect_ratio.den != xlink->sample_aspect_ratio.den || - srclink->w != ylink->w || - srclink->h != ylink->h || - srclink->sample_aspect_ratio.num != ylink->sample_aspect_ratio.num || - srclink->sample_aspect_ratio.den != ylink->sample_aspect_ratio.den) { + if (srclink->w != xlink->w || + srclink->h != xlink->h || + srclink->w != ylink->w || + srclink->h != ylink->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) " - "and/or third input link %s parameters (%dx%d, SAR %d:%d)\n", + "(size %dx%d) do not match the corresponding " + "second input link %s parameters (%dx%d) " + "and/or third input link %s parameters (%dx%d)\n", ctx->input_pads[0].name, srclink->w, srclink->h, - srclink->sample_aspect_ratio.num, - srclink->sample_aspect_ratio.den, ctx->input_pads[1].name, xlink->w, xlink->h, - xlink->sample_aspect_ratio.num, - xlink->sample_aspect_ratio.den, - ctx->input_pads[2].name, ylink->w, ylink->h, - ylink->sample_aspect_ratio.num, - ylink->sample_aspect_ratio.den); + ctx->input_pads[2].name, ylink->w, ylink->h); return AVERROR(EINVAL); } |