diff options
author | Paul B Mahol <onemda@gmail.com> | 2016-01-24 21:57:56 +0300 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2016-01-24 22:29:19 +0300 |
commit | f42eae96b22d2f9a823bc616b2424164524eed96 (patch) | |
tree | 2d65ff45c08c185f1d603e931ad015578e1d66f0 /libavfilter/vf_zoompan.c | |
parent | 8a343443796a334bd8aa5b342daf5e48049f333f (diff) |
avfilter/vf_zoompan: fix pts handling
Now output pts have some sense.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_zoompan.c')
-rw-r--r-- | libavfilter/vf_zoompan.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index fe8dc575e2..208d4d6ded 100644 --- a/libavfilter/vf_zoompan.c +++ b/libavfilter/vf_zoompan.c @@ -92,6 +92,7 @@ typedef struct ZPcontext { int nb_frames; int current_frame; int finished; + AVRational framerate; } ZPContext; #define OFFSET(x) offsetof(ZPContext, x) @@ -103,6 +104,7 @@ static const AVOption zoompan_options[] = { { "y", "set the y expression", OFFSET(y_expr_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags = FLAGS }, { "d", "set the duration expression", OFFSET(duration_expr_str), AV_OPT_TYPE_STRING, {.str="90"}, .flags = FLAGS }, { "s", "set the output image size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="hd720"}, .flags = FLAGS }, + { "fps", "set the output framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, { .str = "25" }, .flags = FLAGS }, { NULL } }; @@ -123,6 +125,8 @@ static int config_output(AVFilterLink *outlink) outlink->w = s->w; outlink->h = s->h; + outlink->time_base = av_inv_q(s->framerate); + outlink->frame_rate = s->framerate; s->desc = av_pix_fmt_desc_get(outlink->format); return 0; @@ -133,8 +137,7 @@ static int output_single_frame(AVFilterContext *ctx, AVFrame *in, double *var_va { ZPContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; - int64_t pts = av_rescale_q(in->pts, ctx->inputs[0]->time_base, - outlink->time_base) + s->frame_count; + int64_t pts = s->frame_count; int k, x, y, w, h, ret = 0; uint8_t *input[4]; int px[4], py[4]; |