generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
ill commit a better solution

This reverts commit 30fe3fd527.
This commit is contained in:
Michael Niedermayer 2015-12-16 18:26:47 +01:00
parent 4a7c705fde
commit 52e7f6b17e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_decimate.c
View File

@ -365,8 +365,6 @@ static int config_output(AVFilterLink *outlink)
DecimateContext *dm = ctx->priv; DecimateContext *dm = ctx->priv;
const AVFilterLink *inlink = const AVFilterLink *inlink =
ctx->inputs[dm->ppsrc ? INPUT_CLEANSRC : INPUT_MAIN]; ctx->inputs[dm->ppsrc ? INPUT_CLEANSRC : INPUT_MAIN];
const AVFilterLink *inlink_main =
ctx->inputs[INPUT_MAIN];
AVRational fps = inlink->frame_rate; AVRational fps = inlink->frame_rate;
if (!fps.num || !fps.den) { 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); "current rate of %d/%d is invalid\n", fps.num, fps.den);
return AVERROR(EINVAL); 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}); fps = av_mul_q(fps, (AVRational){dm->cycle - 1, dm->cycle});
av_log(ctx, AV_LOG_VERBOSE, "FPS: %d/%d -> %d/%d\n", av_log(ctx, AV_LOG_VERBOSE, "FPS: %d/%d -> %d/%d\n",
inlink->frame_rate.num, inlink->frame_rate.den, fps.num, fps.den); inlink->frame_rate.num, inlink->frame_rate.den, fps.num, fps.den);