[FFmpeg-cvslog] Revert "avfilter/vf_decimate: Check that input parameters match"

Michael Niedermayer git at videolan.org
Sun Mar 13 01:19:51 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Dec 16 18:26:47 2015 +0100| [52e7f6b17eed3b613ca630ba5d1d6288db891977] | committer: Michael Niedermayer

Revert "avfilter/vf_decimate: Check that input parameters match"

ill commit a better solution

This reverts commit 30fe3fd52721c8c6566001192cd16be423ffc92b.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52e7f6b17eed3b613ca630ba5d1d6288db891977
---

 libavfilter/vf_decimate.c |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c
index e2c0a32..4cf0771 100644
--- a/libavfilter/vf_decimate.c
+++ b/libavfilter/vf_decimate.c
@@ -365,8 +365,6 @@ static int config_output(AVFilterLink *outlink)
     DecimateContext *dm = ctx->priv;
     const AVFilterLink *inlink =
         ctx->inputs[dm->ppsrc ? INPUT_CLEANSRC : INPUT_MAIN];
-    const AVFilterLink *inlink_main =
-        ctx->inputs[INPUT_MAIN];
     AVRational fps = inlink->frame_rate;
 
     if (!fps.num || !fps.den) {
@@ -374,13 +372,6 @@ static int config_output(AVFilterLink *outlink)
                "current rate of %d/%d is invalid\n", fps.num, fps.den);
         return AVERROR(EINVAL);
     }
-
-    if (inlink->w != inlink_main->w ||
-        inlink->h != inlink_main->h ||
-        inlink->format != inlink_main->format) {
-        av_log(ctx, AV_LOG_ERROR, "frame parameters differ between inputs\n");
-        return AVERROR_PATCHWELCOME;
-    }
     fps = av_mul_q(fps, (AVRational){dm->cycle - 1, dm->cycle});
     av_log(ctx, AV_LOG_VERBOSE, "FPS: %d/%d -> %d/%d\n",
            inlink->frame_rate.num, inlink->frame_rate.den, fps.num, fps.den);



More information about the ffmpeg-cvslog mailing list