videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avfilter/vf_xfade: move passthrough code before eof check

This commit is contained in:
Paul B Mahol 2020-02-03 09:36:52 +01:00
parent 1c15111148
commit 6d5e9ed67c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_xfade.c
View File

@ -978,6 +978,9 @@ static int xfade_activate(AVFilterContext *ctx)
ret = ff_inlink_consume_frame(ctx->inputs[1], &in);
if (ret < 0) {
return ret;
} else if (ret > 0) {
in->pts = (in->pts - s->last_pts) + s->pts;
return ff_filter_frame(outlink, in);
} else if (ff_inlink_acknowledge_status(ctx->inputs[1], &status, &pts)) {
ff_outlink_set_status(outlink, status, s->pts);
return 0;
@ -986,9 +989,6 @@ static int xfade_activate(AVFilterContext *ctx)
ff_inlink_request_frame(ctx->inputs[1]);
return 0;
}
} else {
in->pts = (in->pts - s->last_pts) + s->pts;
return ff_filter_frame(outlink, in);
}
}