har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_zoompan: fix pzoom usage

Browse Source
This commit is contained in:
Paul B Mahol 2016-08-15 09:31:09 +02:00
parent b93e223315
commit ac18114b96
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_zoompan.c
View File

@ -143,6 +143,10 @@ static int output_single_frame(AVFilterContext *ctx, AVFrame *in, double *var_va
int px[4], py[4]; int px[4], py[4];
AVFrame *out; AVFrame *out;
var_values[VAR_PX] = s->x;
var_values[VAR_PY] = s->y;
var_values[VAR_PZOOM] = s->prev_zoom;
var_values[VAR_PDURATION] = s->prev_nb_frames;
var_values[VAR_TIME] = pts * av_q2d(outlink->time_base); var_values[VAR_TIME] = pts * av_q2d(outlink->time_base);
var_values[VAR_FRAME] = i; var_values[VAR_FRAME] = i;
var_values[VAR_ON] = outlink->frame_count + 1; var_values[VAR_ON] = outlink->frame_count + 1;
@ -265,7 +269,7 @@ static int request_frame(AVFilterLink *outlink)
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
ZPContext *s = ctx->priv; ZPContext *s = ctx->priv;
AVFrame *in = s->in; AVFrame *in = s->in;
double zoom=1, dx=0, dy=0; double zoom=-1, dx=-1, dy=-1;
int ret = -1; int ret = -1;
if (in) { if (in) {
@ -276,9 +280,12 @@ static int request_frame(AVFilterLink *outlink)
} }
if (s->current_frame >= s->nb_frames) { if (s->current_frame >= s->nb_frames) {
s->x = dx; if (dx != -1)
s->y = dy; s->x = dx;
s->prev_zoom = zoom; if (dy != -1)
s->y = dy;
if (zoom != -1)
s->prev_zoom = zoom;
s->prev_nb_frames = s->nb_frames; s->prev_nb_frames = s->nb_frames;
s->nb_frames = 0; s->nb_frames = 0;
s->current_frame = 0; s->current_frame = 0;