[FFmpeg-devel] [PATCH 1/2] Revert "avfilter/vf_decimate: Check that input parameters match"

Michael Niedermayer michaelni at gmx.at
Wed Dec 16 18:54:54 CET 2015


From: Michael Niedermayer <michael at niedermayer.cc>

ill commit a better solution

This reverts commit 30fe3fd52721c8c6566001192cd16be423ffc92b.
---
 libavfilter/vf_decimate.c |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c
index cd374c3..a563859 100644
--- a/libavfilter/vf_decimate.c
+++ b/libavfilter/vf_decimate.c
@@ -362,8 +362,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) {
@@ -371,13 +369,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);
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list