summaryrefslogtreecommitdiff
path: root/libavfilter/vf_fps.c
diff options
context:
space:
mode:
authorCalvin Walton <calvin.walton@kepstin.ca>2018-02-22 14:10:04 -0500
committerNicolas George <george@nsup.org>2018-03-08 11:23:34 +0100
commit2b2c8b22da9f9f0005b619a539023afbad1a1edd (patch)
treed904163ab53dea00e7009251d5a25fc171829c51 /libavfilter/vf_fps.c
parente4edc567a077d34f579d31ef0bfe164c7abfac4c (diff)
downloadffmpeg-2b2c8b22da9f9f0005b619a539023afbad1a1edd.tar.gz
libavfilter/vf_fps: Minor cleanups
Since the config_props function now references both the input and output links, rename the 'link' variable to 'outlink'. Fix up some mismatching indentation. Don't bother setting the width and height on the outlink; the filter framework does that for us.
Diffstat (limited to 'libavfilter/vf_fps.c')
-rw-r--r--libavfilter/vf_fps.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index cc350243a9..9167a00a13 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -147,16 +147,14 @@ static av_cold void uninit(AVFilterContext *ctx)
"%d frames duplicated.\n", s->frames_in, s->frames_out, s->drop, s->dup);
}
-static int config_props(AVFilterLink* link)
+static int config_props(AVFilterLink* outlink)
{
- AVFilterContext *ctx = link->src;
- AVFilterLink *inlink = ctx->inputs[0];
- FPSContext *s = ctx->priv;
+ AVFilterContext *ctx = outlink->src;
+ AVFilterLink *inlink = ctx->inputs[0];
+ FPSContext *s = ctx->priv;
- link->time_base = av_inv_q(s->framerate);
- link->frame_rate= s->framerate;
- link->w = link->src->inputs[0]->w;
- link->h = link->src->inputs[0]->h;
+ outlink->time_base = av_inv_q(s->framerate);
+ outlink->frame_rate = s->framerate;
/* Calculate the input and output pts offsets for start_time */
if (s->start_time != DBL_MAX && s->start_time != AV_NOPTS_VALUE) {
@@ -168,7 +166,7 @@ static int config_props(AVFilterLink* link)
}
s->in_pts_off = av_rescale_q_rnd(first_pts, AV_TIME_BASE_Q, inlink->time_base,
s->rounding | AV_ROUND_PASS_MINMAX);
- s->out_pts_off = av_rescale_q_rnd(first_pts, AV_TIME_BASE_Q, link->time_base,
+ s->out_pts_off = av_rescale_q_rnd(first_pts, AV_TIME_BASE_Q, outlink->time_base,
s->rounding | AV_ROUND_PASS_MINMAX);
s->next_pts = s->out_pts_off;
av_log(ctx, AV_LOG_VERBOSE, "Set first pts to (in:%"PRId64" out:%"PRId64") from start time %f\n",